diff --git a/Dockerfile b/Dockerfile
index b3b05bbc5..ed5102923 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,16 @@
-FROM scratch 
+ARG IMAGE=scratch
+FROM ${IMAGE}
+
+ARG VERSION
+LABEL name="kube-arangodb" \
+      vendor="ArangoDB" \
+      version="${VERSION}" \
+      release="${VERSION}" \
+      summary="ArangoDB Kubernetes Oparator" \
+      description="ArangoDB Kubernetes Operator" \
+      maintainer="redhat@arangodb.com"
+
+ADD ./LICENSE /licenses/LICENSE
 
 ADD bin/arangodb_operator /usr/bin/
 
diff --git a/Makefile b/Makefile
index ff9e8ad74..2cde63e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,14 @@ ifndef DEPLOYMENTNAMESPACE
 	DEPLOYMENTNAMESPACE := default
 endif
 
+BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.0
+
 ifndef OPERATORIMAGE
 	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
 endif
+ifndef OPERATORUBIIMAGE
+	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
+endif
 ifndef TESTIMAGE
 	TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
 endif
@@ -161,7 +166,7 @@ fmt:
 	                  $(ROOTDIR)/pkg/backup/...
 
 .PHONY: build
-build: docker manifests
+build: docker docker-ubi manifests
 
 .PHONY: clean
 clean:
@@ -216,11 +221,18 @@ $(BIN): $(SOURCES) dashboard/assets.go VERSION
 
 .PHONY: docker
 docker: check-vars $(BIN)
-	docker build -f $(DOCKERFILE) -t $(OPERATORIMAGE) .
+	docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" -t $(OPERATORIMAGE) .
 ifdef PUSHIMAGES
 	docker push $(OPERATORIMAGE)
 endif
 
+.PHONY: docker-ubi
+docker-ubi: check-vars $(BIN)
+	docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
+ifdef PUSHIMAGES
+	docker push $(OPERATORUBIIMAGE)
+endif
+
 # Manifests
 
 .PHONY: manifests-crd