diff --git a/.tekton/config-policy-controller-acm-216-push.yaml b/.tekton/config-policy-controller-acm-216-push.yaml
index 0cc2cce1..b1a1e8d7 100644
--- a/.tekton/config-policy-controller-acm-216-push.yaml
+++ b/.tekton/config-policy-controller-acm-216-push.yaml
@@ -39,6 +39,12 @@ spec:
         - linux/arm64
         - linux/ppc64le
         - linux/s390x
+    - name: additional-tags
+      value:
+        - latest
+    - name: build-args
+      value:
+        - ACM_VERSION=2.16
   pipelineRef:
     resolver: git
     params:
diff --git a/build/Dockerfile b/build/Dockerfile
index 2a4e4a0c..72a3d981 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,3 +1,5 @@
+ARG ACM_VERSION=${ACM_VERSION}
+
 # Copyright Contributors to the Open Cluster Management project
 
 # Stage 1: Use image builder to build the target binaries
@@ -37,3 +39,4 @@ LABEL io.k8s.description="The ConfigurationPolicy kind compares the desired obje
     The OperatorPolicy kind determines whether operators deployed on the cluster match the configuration in the policy."
 LABEL com.redhat.component="acm-config-policy-controller-container"
 LABEL io.openshift.tags="data,images"
+LABEL cpe="cpe:/a:redhat:acm:${ACM_VERSION}::el9"
diff --git a/build/Dockerfile.rhtap b/build/Dockerfile.rhtap
index d859b5da..1b3d1971 100644
--- a/build/Dockerfile.rhtap
+++ b/build/Dockerfile.rhtap
@@ -1,3 +1,5 @@
+ARG ACM_VERSION=${ACM_VERSION}
+
 # Copyright Contributors to the Open Cluster Management project
 
 # Stage 1: Use image builder to build the target binaries
@@ -38,3 +40,4 @@ LABEL io.k8s.description="The ConfigurationPolicy kind compares the desired obje
 LABEL com.redhat.component="acm-config-policy-controller-container"
 LABEL io.openshift.tags="data,images"
 LABEL url="https://github.com/stolostron/config-policy-controller"
+LABEL cpe="cpe:/a:redhat:acm:${ACM_VERSION}::el9"