diff --git a/.zuul.yaml b/.zuul.yaml
index edd1053..a0f7dbc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,10 +6,16 @@
         - tox-py27:
             voting: false
         - tox-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
         - tox-pep8-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
     gate:
       jobs:
@@ -18,8 +24,17 @@
         - tox-py27:
             voting: false
         - tox-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
         - tox-pep8-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
+    release:
+      jobs:
+        - upload-pypi
diff --git a/requirements.txt b/requirements.txt
index 374b584..c254747 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@ requests
 pycrypto
 urllib3
 PrettyTable
-pyyaml
+pyyaml<6.0.0
 GitPython