diff --git a/releasenotes/notes/image-name-convention-3acbf8dddd42427a.yaml b/releasenotes/notes/image-name-convention-3acbf8dddd42427a.yaml
new file mode 100644
index 00000000..293930c0
--- /dev/null
+++ b/releasenotes/notes/image-name-convention-3acbf8dddd42427a.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Images are now built with tagging like version-distro.
diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml
index ee6ca3c4..8a676661 100644
--- a/zuul.d/ceph-config-helper.yaml
+++ b/zuul.d/ceph-config-helper.yaml
@@ -36,13 +36,13 @@
         - context: ceph-config-helper
           repository: openstackhelm/ceph-config-helper
           tags:
-            - opensuse_15-latest
+            - latest-opensuse_15
           dockerfile: Dockerfile.suse_15
         - context: ceph-config-helper
           repository: openstackhelm/ceph-config-helper
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &ceph-config-helper_files
       - ceph-config-helper/.*
       - zuul.d/ceph-config-helper.yaml
diff --git a/zuul.d/ceph-daemon.yaml b/zuul.d/ceph-daemon.yaml
index 1835a248..d107e194 100644
--- a/zuul.d/ceph-daemon.yaml
+++ b/zuul.d/ceph-daemon.yaml
@@ -37,7 +37,7 @@
           repository: openstackhelm/ceph-daemon
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &ceph-daemon_files
       - ceph-daemon/.*
       - zuul.d/ceph-daemon.yaml
diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml
index ca1f7506..b5759584 100644
--- a/zuul.d/ceph-utility.yaml
+++ b/zuul.d/ceph-utility.yaml
@@ -37,7 +37,7 @@
           repository: openstackhelm/ceph-utility
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &ceph-utility_files
       - ceph-utility/.*
       - zuul.d/ceph-utility.yaml
diff --git a/zuul.d/gate-utils.yaml b/zuul.d/gate-utils.yaml
index 521a0d3f..cf510060 100644
--- a/zuul.d/gate-utils.yaml
+++ b/zuul.d/gate-utils.yaml
@@ -36,13 +36,13 @@
         - context: gate-utils
           repository: openstackhelm/gate-utils
           tags:
-            - opensuse_15-latest
+            - latest-opensuse_15
           dockerfile: Dockerfile.suse_15
         - context: gate-utils
           repository: openstackhelm/gate-utils
           dockerfile: Dockerfile.debian
           tags:
-            - debian-latest
+            - latest-debian
     files: &gate-utils_files
       - gate-utils/.*
       - zuul.d/gate-utils.yaml
diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml
index 63021341..42a13590 100644
--- a/zuul.d/mariadb.yaml
+++ b/zuul.d/mariadb.yaml
@@ -37,7 +37,7 @@
           repository: openstackhelm/mariadb
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &mariadb_files
       - mariadb/.*
       - zuul.d/mariadb.yaml
diff --git a/zuul.d/mini-mirror.yaml b/zuul.d/mini-mirror.yaml
index ea1a6e70..e4ffc209 100644
--- a/zuul.d/mini-mirror.yaml
+++ b/zuul.d/mini-mirror.yaml
@@ -38,7 +38,7 @@
           repository: openstackhelm/mini-mirror
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &mini-mirror_files
       - mini-mirror/.*
       - zuul.d/mini-mirror.yaml
diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml
index 77eb454a..5ec3315e 100644
--- a/zuul.d/openvswitch.yaml
+++ b/zuul.d/openvswitch.yaml
@@ -36,13 +36,13 @@
         - context: openvswitch
           repository: openstackhelm/openvswitch
           tags:
-            - opensuse_15-latest
+            - latest-opensuse_15
           dockerfile: Dockerfile.suse_15
         - context: openvswitch
           repository: openstackhelm/openvswitch
           dockerfile: Dockerfile.debian
           tags:
-            - debian-latest
+            - latest-debian
     files: &openvswitch_files
       - openvswitch/.*
       - zuul.d/openvswitch.yaml
diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml
index 209fa9b5..11876062 100644
--- a/zuul.d/tempest.yaml
+++ b/zuul.d/tempest.yaml
@@ -37,7 +37,7 @@
           repository: openstackhelm/tempest
           dockerfile: Dockerfile.ubuntu_xenial
           tags:
-            - ubuntu_xenial-latest
+            - latest-ubuntu_xenial
     files: &tempest_files
       - tempest/.*
       - zuul.d/tempest.yaml
diff --git a/zuul.d/vbmc.yaml b/zuul.d/vbmc.yaml
index 49fd4f8d..04d8d822 100644
--- a/zuul.d/vbmc.yaml
+++ b/zuul.d/vbmc.yaml
@@ -36,13 +36,13 @@
         - context: vbmc
           repository: openstackhelm/vbmc
           tags:
-            - opensuse_15-latest
+            - latest-opensuse_15
           dockerfile: Dockerfile.suse_15
         - context: vbmc
           repository: openstackhelm/vbmc
           dockerfile: Dockerfile.centos_7
           tags:
-            - centos_7-latest
+            - latest-centos_7
     files: &vbmc_files
       - vbmc/.*
       - zuul.d/vbmc.yaml