diff --git a/Makefile b/Makefile
index c8d27aa..ec99e65 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ GOLANG_VERSION := 1.14.2
 VERSION        := 2.0.0-rc.7
 FULL_VERSION   := $(DCGM_VERSION)-$(VERSION)
 
-.PHONY: all binary install
+.PHONY: all binary install check-format
 all: ubuntu18.04 ubi8
 
 binary:
@@ -32,6 +32,9 @@ install: binary
 	install -m 557 -D ./etc/dcgm-exporter/default-counters.csv /etc/dcgm-exporter/default-counters.csv
 	install -m 557 -D ./etc/dcgm-exporter/dcp-metrics-included.csv /etc/dcgm-exporter/dcp-metrics-included.csv
 
+check-format:
+	test $$(gofmt -l pkg bindings | tee /dev/stderr | wc -l) -eq 0
+
 push:
 	$(DOCKER) push "$(REGISTRY)/dcgm-exporter:$(FULL_VERSION)-ubuntu18.04"
 	$(DOCKER) push "$(REGISTRY)/dcgm-exporter:$(FULL_VERSION)-ubi8"
diff --git a/docker/Dockerfile.ubi8 b/docker/Dockerfile.ubi8
index 0083fd9..37e9c0d 100644
--- a/docker/Dockerfile.ubi8
+++ b/docker/Dockerfile.ubi8
@@ -4,7 +4,7 @@ WORKDIR /go/src/github.com/NVIDIA/gpu-monitoring-tools
 
 COPY . .
 
-RUN make binary
+RUN make binary check-format
 
 FROM registry.access.redhat.com/ubi8:latest
 LABEL io.k8s.display-name="NVIDIA DCGM Exporter"
diff --git a/docker/Dockerfile.ubuntu18.04 b/docker/Dockerfile.ubuntu18.04
index fa87f3f..0eb50a7 100644
--- a/docker/Dockerfile.ubuntu18.04
+++ b/docker/Dockerfile.ubuntu18.04
@@ -4,7 +4,7 @@ WORKDIR /go/src/github.com/NVIDIA/gpu-monitoring-tools
 
 COPY . .
 
-RUN make binary
+RUN make binary check-format
 
 FROM ubuntu:18.04
 LABEL io.k8s.display-name="NVIDIA DCGM Exporter"