diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index adfb2c20ba..12e2a9e14b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -275,29 +275,24 @@
 
 # opensuse
 - job:
-    name: openstack-ansible-deploy-aio_lxc-opensuse-150
+    name: openstack-ansible-deploy-aio_lxc-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-150
+    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_ceph-opensuse-150
+    name: openstack-ansible-deploy-aio_ceph-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_distro_ceph-opensuse-150
+    name: openstack-ansible-deploy-aio_distro_ceph-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-
-- job:
-    name: openstack-ansible-deploy-aio_metal-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
     name: openstack-ansible-deploy-aio_metal-opensuse-15
@@ -305,14 +300,9 @@
     nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+    name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-opensuse-15
@@ -320,6 +310,6 @@
     nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_nspawn-opensuse-150
+    name: openstack-ansible-deploy-aio_nspawn-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index e6e463cff2..bba4ed8c63 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -52,14 +52,14 @@
         - openstack-ansible-upgrade-aio_lxc-ubuntu-bionic
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_lxc-opensuse-150
+        - openstack-ansible-deploy-aio_lxc-opensuse-15
 
 - project-template:
     name: openstack-ansible-deploy-aio_distro_lxc-jobs
     experimental:
       jobs:
         - openstack-ansible-deploy-aio_distro_lxc-centos-7
-        - openstack-ansible-deploy-aio_distro_lxc-opensuse-150
+        - openstack-ansible-deploy-aio_distro_lxc-opensuse-15
         - openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic
 
 - project-template:
@@ -94,7 +94,7 @@
         - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+        - openstack-ansible-deploy-aio_telemetry_metal-opensuse-15
 
 - project-template:
     name: openstack-ansible-deploy-aio_distro_metal-jobs
@@ -118,7 +118,7 @@
       jobs:
         - openstack-ansible-deploy-aio_nspawn-centos-7:
             voting: false
-        - openstack-ansible-deploy-aio_nspawn-opensuse-150:
+        - openstack-ansible-deploy-aio_nspawn-opensuse-15:
             voting: false
         - openstack-ansible-deploy-aio_nspawn-ubuntu-bionic:
             voting: false
@@ -151,7 +151,7 @@
     name: openstack-ansible-deploy-distro_ceph-jobs
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_distro_ceph-opensuse-150
+        - openstack-ansible-deploy-aio_distro_ceph-opensuse-15
 
 - project-template:
     name: openstack-ansible-linters-jobs