diff --git a/.zuul.yaml b/.zuul.yaml
index dd66e2c..bed5a46 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,13 +1,14 @@
 - project:
+    templates:
+      - check-requirements
+      - tempest-plugin-jobs
     check:
       jobs:
         - cinder-tempest-plugin-lvm-lio
-    gate:
-      jobs:
-        - cinder-tempest-plugin-lvm-lio
 
 - job:
     name: cinder-tempest-plugin-lvm-lio
+    voting: false
     description: |
       Run Cinder Tempest Plugin tests
     parent: devstack-tempest
@@ -21,13 +22,13 @@
       - openstack/cinder
     vars:
       tempest_test_regex: (tempest\.(api|scenario)|cinder_tempest_plugin)
-      tempest_test_blacklist: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tempest_blacklist.txt"
-      tox_envlist: 'all'
+      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tempest_blacklist.txt'
+      tox_envlist: all
       devstack_localrc:
-        CINDER_ISCSI_HELPER: 'lioadm'
-        TEMPEST_PLUGINS: '/opt/stack/cinder-tempest-plugin'
+        CINDER_ISCSI_HELPER: lioadm
+        TEMPEST_PLUGINS: /opt/stack/cinder-tempest-plugin
       devstack_plugins:
-        barbican: 'git://git.openstack.org/openstack/barbican'
+        barbican: git://git.openstack.org/openstack/barbican
       devstack_services:
         barbican: true
     irrelevant-files:
diff --git a/HACKING.rst b/HACKING.rst
index dc34b75..7faf92f 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,4 +2,4 @@
 
 ===============================================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/