diff --git a/templates/github/.github/workflows/scripts/build_python_client.sh.j2 b/templates/github/.github/workflows/scripts/build_python_client.sh.j2
index 5842c268..b2b6a0d2 100755
--- a/templates/github/.github/workflows/scripts/build_python_client.sh.j2
+++ b/templates/github/.github/workflows/scripts/build_python_client.sh.j2
@@ -17,7 +17,7 @@ rm -rf "{{ plugin.name | snake }}-client"
 ./gen-client.sh "../{{ plugin_name }}/{{ plugin.app_label }}-api.json" "{{ plugin.app_label }}" python "{{ plugin.name | snake }}"
 
 pushd {{ plugin.name | snake }}-client
-python setup.py sdist bdist_wheel --python-tag py3
+python -m build
 
 twine check "dist/{{ plugin.name | snake }}_client-"*"-py3-none-any.whl"
 twine check "dist/{{ plugin.name | snake }}_client-"*".tar.gz"
diff --git a/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2 b/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
index 99f398d7..18709f7a 100755
--- a/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
+++ b/templates/github/.github/workflows/scripts/publish_client_pypi.sh.j2
@@ -18,6 +18,6 @@ fi
 twine upload -u __token__ -p "${PYPI_API_TOKEN}" \
 {%- for plugin in plugins %}
 "dist/{{ plugin.name | snake }}_client-${VERSION}-py3-none-any.whl" \
-"dist/{{ plugin.name | snake }}-client-${VERSION}.tar.gz" \
+"dist/{{ plugin.name | snake }}_client-${VERSION}.tar.gz" \
 {%- endfor %}
 ;
diff --git a/templates/github/.github/workflows/scripts/script.sh.j2 b/templates/github/.github/workflows/scripts/script.sh.j2
index 9ccc2b67..e7a927b0 100755
--- a/templates/github/.github/workflows/scripts/script.sh.j2
+++ b/templates/github/.github/workflows/scripts/script.sh.j2
@@ -67,7 +67,7 @@ pushd ../pulp-openapi-generator
       rm -rf "./${PACKAGE}-client"
       ./gen-client.sh "${COMPONENT}-api.json" "${COMPONENT}" python "${PACKAGE}"
       pushd "${PACKAGE}-client"
-        python setup.py sdist bdist_wheel --python-tag py3
+        python -m build
       popd
     else
       if [ ! -f "${PACKAGE}-client/dist/${PACKAGE}_client-${VERSION}-py3-none-any.whl" ]
diff --git a/templates/github/.github/workflows/test.yml.j2 b/templates/github/.github/workflows/test.yml.j2
index 854b8ed8..252cd897 100644
--- a/templates/github/.github/workflows/test.yml.j2
+++ b/templates/github/.github/workflows/test.yml.j2
@@ -67,7 +67,7 @@ jobs:
           {%- endfor %}
       {%- endif %}
 
-      {{ install_python_deps(["towncrier", "twine", "wheel", "httpie", "docker", "netaddr", "boto3", "ansible~=10.3.0", "mkdocs", "jq", "jsonpatch", "bump-my-version", "click<8.3"]) | indent(6) }}
+      {{ install_python_deps(["build", "towncrier", "twine", "wheel", "httpie", "docker", "netaddr", "boto3", "ansible~=10.3.0", "mkdocs", "jq", "jsonpatch", "bump-my-version", "click<8.3"]) | indent(6) }}
 
       {{ setup_env() | indent(6) }}