diff --git a/Dockerfile b/Dockerfile
index c96d232364..e6d787a93b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,16 @@ ARG VERSION="dev"
 ARG TARGETARCH
 
 ENV SUMMARY="CloudNativePG Operator Container Image." \
-    DESCRIPTION="This Docker image contains CloudNativePG Operator."
+    DESCRIPTION="This Docker image contains CloudNativePG Operator." \
+    MAINTAINER="CloudNativePG Contributors."
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.display-name="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       name="CloudNativePG Operator" \
-      vendor="CloudNativePG Contributors" \
+      vendor="$MAINTAINER" \
+      maintainer="$MAINTAINER" \
       url="https://cloudnative-pg.io/" \
       version="$VERSION" \
       release="1"
diff --git a/Dockerfile-ubi8 b/Dockerfile-ubi8
index 4c2712de72..1aea9e40ac 100644
--- a/Dockerfile-ubi8
+++ b/Dockerfile-ubi8
@@ -3,14 +3,16 @@ ARG VERSION="dev"
 ARG TARGETARCH
 
 ENV SUMMARY="CloudNativePG Operator Container Image." \
-    DESCRIPTION="This Docker image contains CloudNativePG Operator."
+    DESCRIPTION="This Docker image contains CloudNativePG Operator." \
+    MAINTAINER="CloudNativePG Contributors."
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.display-name="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       name="CloudNativePG Operator" \
-      vendor="CloudNativePG Contributors" \
+      vendor="$MAINTAINER" \
+      maintainer="$MAINTAINER" \
       url="https://cloudnative-pg.io/" \
       version="$VERSION" \
       release="1"
diff --git a/Dockerfile-ubi9 b/Dockerfile-ubi9
index 74409e03ca..0d846d91b0 100644
--- a/Dockerfile-ubi9
+++ b/Dockerfile-ubi9
@@ -3,14 +3,16 @@ ARG VERSION="dev"
 ARG TARGETARCH
 
 ENV SUMMARY="CloudNativePG Operator Container Image." \
-    DESCRIPTION="This Docker image contains CloudNativePG Operator."
+    DESCRIPTION="This Docker image contains CloudNativePG Operator." \
+    MAINTAINER="CloudNativePG Contributors."
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.display-name="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       name="CloudNativePG Operator" \
-      vendor="CloudNativePG Contributors" \
+      vendor="$MAINTAINER" \
+      maintainer="$MAINTAINER" \
       url="https://cloudnative-pg.io/" \
       version="$VERSION" \
       release="1"