diff --git a/Makefile b/Makefile
index 1d5a495..111b6b6 100644
--- a/Makefile
+++ b/Makefile
@@ -44,14 +44,15 @@ push-latest:
 
 ubuntu18.04:
 	$(DOCKER) build --pull \
-		--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
-		--build-arg DCGM_VERSION="$(DCGM_VERSION)" \
+		--build-arg "GOLANG_VERSION=$(GOLANG_VERSION)" \
+		--build-arg "DCGM_VERSION=$(DCGM_VERSION)" \
 		--tag "$(REGISTRY)/dcgm-exporter:$(FULL_VERSION)-ubuntu18.04" \
 		--file docker/Dockerfile.ubuntu18.04 .
 
 ubi8:
 	$(DOCKER) build --pull \
-		--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
-		--build-arg DCGM_VERSION="$(DCGM_VERSION)" \
+		--build-arg "GOLANG_VERSION=$(GOLANG_VERSION)" \
+		--build-arg "DCGM_VERSION=$(DCGM_VERSION)" \
+		--build-arg "VERSION=$(FULL_VERSION)" \
 		--tag "$(REGISTRY)/dcgm-exporter:$(FULL_VERSION)-ubi8" \
 		--file docker/Dockerfile.ubi8 .
diff --git a/docker/Dockerfile.ubi8 b/docker/Dockerfile.ubi8
index 13211a2..0083fd9 100644
--- a/docker/Dockerfile.ubi8
+++ b/docker/Dockerfile.ubi8
@@ -23,4 +23,16 @@ ENV NVIDIA_VISIBLE_DEVICES=all
 RUN useradd dcgm-exporter
 USER dcgm-exporter
 
+ARG VERSION
+
+LABEL io.k8s.display-name="NVIDIA DCGM Eporter"
+LABEL name="NVIDIA DCGM Exporter"
+LABEL vendor="NVIDIA"
+LABEL version="${VERSION}"
+LABEL release="N/A"
+LABEL summary="Exports GPU Metrics in the prometheus format"
+LABEL description="See summary"
+
+COPY ./LICENSE ./licenses/LICENSE
+
 ENTRYPOINT ["/usr/bin/dcgm-exporter"]