diff --git a/.zuul.yaml b/.zuul.yaml
index 56b7493..d3c42e5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,14 +21,11 @@
 
 - job:
     name: neutron-policy-server-release
-    parent: python-upload-pypi
-    pre-run: playbooks/release/pre.yaml
-    vars:
-      release_python: python3
+    parent: neutron-policy-server-build
+    post-run: playbooks/release/post.yaml
     secrets:
       - secret: neutron-policy-server-pypi
         name: pypi_info
-        pass-to-parent: true
 
 - project:
     merge-mode: squash-merge
diff --git a/playbooks/release/post.yaml b/playbooks/release/post.yaml
new file mode 100644
index 0000000..c766702
--- /dev/null
+++ b/playbooks/release/post.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+  roles:
+    - role: ensure-twine
+    - role: upload-pypi
+      when: zuul_success | bool
diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml
deleted file mode 100644
index c38442d..0000000
--- a/playbooks/release/pre.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - role: ensure-twine