diff --git a/MANIFEST.in b/MANIFEST.in
index e939f9e..669e86e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,21 +1,6 @@
 include pybuild/templates/*.html
-include pybuild/static_code/DIDApiTL/*
-include pybuild/static_code/DIDApiEC/*
-include pybuild/static_code/bosch_headers/*
-include pybuild/static_code/csp_headers/*
-include pybuild/static_code/denso_headers/*
-include pybuild/static_code/hi_headers/*
-include pybuild/static_code/BoschCoreAPIEC/*
-include pybuild/static_code/BoschCoreAPITL/*
-include pybuild/static_code/CSPCoreAPITL/*
-include pybuild/static_code/CSPCoreAPIEC/*
-include pybuild/static_code/DensoCoreAPIEC/*
-include pybuild/static_code/DensoCoreAPITL/*
 include test-requirements.txt
 include pybuild/matlab_scripts/CodeGen/*
 include pybuild/matlab_scripts/helperFunctions/*
 include pybuild/matlab_scripts/*
 include requirements.txt
-prune pybuild/test
-prune pybuild/interface/test
-prune pybuild/lib/test
diff --git a/playbooks/upload-pypi.yaml b/playbooks/upload-pypi.yaml
new file mode 100644
index 0000000..c766702
--- /dev/null
+++ b/playbooks/upload-pypi.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+  roles:
+    - role: ensure-twine
+    - role: upload-pypi
+      when: zuul_success | bool
diff --git a/requirements.txt b/requirements.txt
index 619c24a..0dcec7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 gitpython >= 3.1.8
-pbr >= 5.5.0
+pbr >= 6.0.0
 ruamel.yaml.clib == 0.2.7; python_version == "3.6"
 ruamel.yaml == 0.17.21; python_version == "3.6"
 ruamel.yaml == 0.18.6; python_version > "3.6"
diff --git a/setup.cfg b/setup.cfg
index f77bb06..2d3762a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,8 @@
 [metadata]
-name = pt-pybuild
+name = powertrain-build
 author = Henrik Wahlqvist
 author-email = henrik.wahlqvist@volvocars.com
-summary = A Continuous Integration (CI) build system testing all configurations where a TargetLink model is used.
+summary = A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 description-file = README.md
 description-content-type = text/x-rst; charset=UTF-8
 license = Apache License, Version 2.0
@@ -21,6 +21,7 @@ classifier =
 
 [options]
 include_package_data = True
+requires_python = >=3.6, <3.11
 
 [files]
 packages =
diff --git a/setup.py b/setup.py
index 097b23f..5de819b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,11 @@
 # Copyright 2024 Volvo Car Corporation
 # Licensed under Apache 2.0.
 
-"""Create a python package for pybuild."""
+"""Create a python package for powertrain-build using setuptools and PBR."""
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 setup(
-    setup_requires=['pbr>=5.5.0'],
+    setup_requires=['pbr'],
     pbr=True,
-    python_requires='>=3.6, <3.11',
-    include_package_data=True,
-
 )
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index d9e878d..e3bf505 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -1,9 +1,12 @@
 - project:
     check:
       jobs:
-        - powertrain-build-tox
         - noop
+        - powertrain-build-tox
     gate:
       jobs:
-        - powertrain-build-tox
         - noop
+        - powertrain-build-tox
+    release:
+      jobs:
+        - release-powertrain-build
diff --git a/zuul.d/release-jobs.yaml b/zuul.d/release-jobs.yaml
index 628900b..26f9ff4 100644
--- a/zuul.d/release-jobs.yaml
+++ b/zuul.d/release-jobs.yaml
@@ -1,13 +1,12 @@
 - job:
     name: release-powertrain-build
-    parent: python-upload-pypi
+    parent: build-python-release
     description: Generate and upload a python source tarball and binary wheel for powertrain-build.
+    post-run: playbooks/upload-pypi.yaml
     vars:
       release_python: python3
+      twine_python: python3
     secrets:
       - name: pypi_info
         secret: powertrain-build-pypi
-
-- job:
-    name: temp-failing-job
-    run: playbooks/failing-job.yaml
+        pass-to-parent: true