diff --git a/meta/main.yml b/meta/main.yml
index 4c248abe..01704bae 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -27,6 +27,9 @@ galaxy_info:
       versions:
         - xenial
         - bionic
+    - name: opensuse
+      versions:
+        - 15
   categories:
     - cloud
     - development
diff --git a/vars/suse.yml b/vars/suse.yml
new file mode 100644
index 00000000..b3827cbe
--- /dev/null
+++ b/vars/suse.yml
@@ -0,0 +1,19 @@
+---
+# Copyright 2019, SUSE Linux GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+octavia_distro_packages:
+  - iptables
+  - libxml2-devel
+  - git-core
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6e226012..e1e381ae 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -12,38 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- job:
-    name: openstack-ansible-deploy-aio_metal_octavia-centos-7
-    parent: openstack-ansible-deploy-aio
-    nodeset: centos-7
-    vars:
-      action: deploy
-      scenario: aio_metal_octavia
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_octavia-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-    vars:
-      action: deploy
-      scenario: aio_metal_octavia
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_octavia-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: aio_metal_octavia
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_octavia-debian-stable
-    parent: openstack-ansible-deploy-aio
-    nodeset: debian-stable
-    vars:
-      action: deploy
-      scenario: aio_metal_octavia
-
 - job:
     name: openstack-ansible-deploy-aio_distro_metal_octaviav2-centos-7
     parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index aefdbb6c..3c5c35ed 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,13 +16,14 @@
     templates:
       - check-requirements
       - openstack-ansible-linters
+      - openstack-ansible-deploy-aio_metal-jobs
+      # Need to add support of distro installs before
+      # adding the next job template
+      # - openstack-ansible-deploy-aio_distro_metal-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-deploy-aio_metal_octavia-centos-7
-        - openstack-ansible-deploy-aio_metal_octavia-debian-stable
-        - openstack-ansible-deploy-aio_metal_octavia-ubuntu-bionic
         - openstack-ansible-deploy-aio_distro_metal_octaviav2-centos-7
 
     experimental:
@@ -30,7 +31,4 @@
         - openstack-ansible-deploy-aio_metal_octavia-opensuse-150
     gate:
       jobs:
-        - openstack-ansible-deploy-aio_metal_octavia-centos-7
-        - openstack-ansible-deploy-aio_metal_octavia-debian-stable
-        - openstack-ansible-deploy-aio_metal_octavia-ubuntu-bionic
         - openstack-ansible-deploy-aio_distro_metal_octaviav2-centos-7