diff --git a/roles/container-build/defaults/main.yaml b/roles/container-build/defaults/main.yaml
index 680cd1442..7d4d5b95d 100644
--- a/roles/container-build/defaults/main.yaml
+++ b/roles/container-build/defaults/main.yaml
@@ -18,8 +18,11 @@ local_registry_ip: 127.0.0.1
 local_registry_port: 5001
 container_registry_namespace: tripleomaster
 container_tag: current-tripleo
+# Notes(chandankumar): openstack- prefix is used from victoria release onwards
 docker_prep_prefix: >-
-  {% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%}
+  {% if (job.build_container_images|default(false)|bool and
+        not job.provider_job|default(false)|bool) or
+        release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
   openstack
   {%- else -%}
   {{ ansible_distribution | lower }}-binary
diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index 26128e84f..1c840cef2 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -40,11 +40,14 @@ docker_registry_host: docker.io
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: current-tripleo
 # docker prefix
+# Notes(chandankumar): openstack- prefix is used from victoria release onwards
 docker_prep_prefix: >-
-  {% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%}
-  openstack-
+  {% if (job.build_container_images|default(false)|bool and
+        not job.provider_job|default(false)|bool) or
+        release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
+  openstack
   {%- else -%}
-  {{ ansible_distribution | lower }}-binary-
+  {{ ansible_distribution | lower }}-binary
   {%- endif -%}
 # docker suffix
 docker_prep_suffix: ""