diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml
index a7c6675c..b5a66204 100644
--- a/tasks/octavia_security_group.yml
+++ b/tasks/octavia_security_group.yml
@@ -25,24 +25,17 @@
       {{ (octavia_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
   block:
     - name: Setup the service project quota
-      # The os_quota module has a bug that it always requires a
-      # configured cinder service to work, so we use the CLI instead.
-      # TODO(_xgerman):
-      # Use the os_quota module once the issue is resolved.
-      shell: >-
-        openstack quota set
-        --os-cloud default
-        --cores {{ octavia_num_cores }}
-        --instances {{ octavia_num_instances }}
-        --ram {{ octavia_ram }}
-        --server-groups {{ octavia_num_server_groups }}
-        --server-group-members {{ octavia_num_server_group_members }}
-        --secgroups {{ octavia_num_secgroups }}
-        --ports {{ octavia_num_ports }}
-        --secgroup-rules {{ octavia_num_security_group_rules }}
-        {{ octavia_service_project_name }}
-      tags:
-        - skip_ansible_lint
+      os_quota:
+        cloud: default
+        name: "{{ octavia_service_project_name }}"
+        cores: "{{ octavia_num_cores }}"
+        instances: "{{ octavia_num_instances }}"
+        ram: "{{ octavia_ram }}"
+        server_groups: "{{ octavia_num_server_groups }}"
+        server_group_members: "{{ octavia_num_server_group_members }}"
+        security_group: "{{ octavia_num_secgroups }}"
+        security_group_rule: "{{ octavia_num_security_group_rules }}"
+        port: "{{ octavia_num_ports }}"
 
     - name: Create Octavia security group
       os_security_group:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
new file mode 100644
index 00000000..6fcac33e
--- /dev/null
+++ b/zuul.d/jobs.yaml
@@ -0,0 +1,37 @@
+---
+#
+# 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.
+
+- 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
\ No newline at end of file
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e17607fa..da4135e5 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,18 +15,17 @@
 - project:
     templates:
       - check-requirements
+      - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-linters
-        - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-functional-ubuntu-bionic
+        - openstack-ansible-deploy-aio_metal_octavia-centos-7
+        - openstack-ansible-deploy-aio_metal_octavia-ubuntu-bionic
     experimental:
       jobs:
-        - openstack-ansible-integrated-deploy-aio
+        - openstack-ansible-deploy-aio_metal_octavia-opensuse-150
     gate:
       jobs:
-        - openstack-ansible-linters
-        - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-functional-ubuntu-bionic
+        - openstack-ansible-deploy-aio_metal_octavia-centos-7
+        - openstack-ansible-deploy-aio_metal_octavia-ubuntu-bionic