diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4ac25c1..20a1709c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,9 +231,4 @@ release:
     - build:x86:frontend
     - build:x86:rpm
   script:
-    - cd python-client
-    - python3 setup.py sdist bdist_wheel
-    - twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing
-    - mv dist/* ..
-    - cd ..
     - bash gitlab_upload_release.sh
diff --git a/gitlab_upload_release.sh b/gitlab_upload_release.sh
index fee52f4a..3683410a 100644
--- a/gitlab_upload_release.sh
+++ b/gitlab_upload_release.sh
@@ -32,3 +32,11 @@ release-cli create --name "Release $PACKAGE_VERSION_SEM" --tag-name $PACKAGE_VER
   --assets-link "{\"name\":\"jfjoch-driver-dkms-${PACKAGE_VERSION}-1.el8.noarch.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-driver-dkms-${PACKAGE_VERSION}-1.el8.noarch.rpm\",\"link_type\":\"package\"}" \
   --assets-link "{\"name\":\"jfjoch_client-${PACKAGE_VERSION_PYTHON}-py3-none-any.whl\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch_client-${PACKAGE_VERSION_PYTHON}-py3-none-any.whl\",\"link_type\":\"package\"}" \
   --assets-link "{\"name\":\"jfjoch-client-${PACKAGE_VERSION_PYTHON}.tar.gz\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-client-${PACKAGE_VERSION_PYTHON}.tar.gz\",\"link_type\":\"package\"}"
+
+if [ -n "$CI_PYPI_TOKEN" ]; then
+  cd python-client
+  python3 setup.py sdist bdist_wheel
+  twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing
+  mv dist/* ..
+  cd ..
+fi
\ No newline at end of file