diff --git a/16/Dockerfile.rhel10 b/16/Dockerfile.rhel10
index b482e7c8..9ec4cf1a 100644
--- a/16/Dockerfile.rhel10
+++ b/16/Dockerfile.rhel10
@@ -30,7 +30,6 @@ LABEL summary="$SUMMARY" \
       io.openshift.s2i.assemble-user="26" \
       name="rhel10/postgresql-16" \
       com.redhat.component="postgresql-16-container" \
-      version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
       usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel10/postgresql-16" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"
diff --git a/src/Dockerfile b/src/Dockerfile
index 5e59a742..d06f414a 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -32,12 +32,10 @@ LABEL summary="$SUMMARY" \
       io.openshift.s2i.assemble-user="26" \
       name="{{ spec.img_name }}" \
       com.redhat.component="{{ spec.redhat_component }}" \
-{% if spec.version not in ["9.4", "9.5", "9.6"] %}
+{% if config.os.id == "rhel" and spec.prod != "rhel10" %}
       version="1" \
-{% elif spec.version == "9.6" and config.os.id == "rhel" %}
+{% elif spec.prod in ["c9s", "c10s"] %}
       version="1" \
-{% else %}
-      version="{{ spec.version }}" \
 {% endif %}
 {% if config.os.id == 'rhel' %}
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \