diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3885773cda0c091e1bfc63470daaa89528dea54..1788ef7ef72675eda63340d1dadf4f9269119575 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,6 +150,21 @@ publish_on_gitlab:
       python -m twine upload \
       --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
 
+publish_on_pypi:
+  stage: publish
+  environment: pypi
+  needs:
+    - package_files
+  when: manual
+  rules:
+    - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
+  script:
+    - echo "run twine for gitlab"
+    - |
+      TWINE_PASSWORD="${PYPI_TOKEN}" \
+      TWINE_USERNAME="__token__" \
+      python -m twine upload dist/*
+
 publish_to_readthedocs:
   stage: publish
   allow_failure: true
diff --git a/setup.cfg b/setup.cfg
index d8ef1e48e998664046fe8930eb420617744da12f..3f014c59a0832bd8d27cb48284b60aab94164d75 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,11 +3,11 @@ name = lofar-stingray
 description = LOFAR station statistics gather and dump utility, writes station statistics continuously to the local S3 based object storage.
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://git.astron.nl/templates/python-package
+url = https://git.astron.nl/lofar2.0/stingray
 license = Apache License 2.0
 classifiers =
     Development Status :: 3 - Alpha
-    Environment :: Web Environment
+    Environment :: No Input/Output (Daemon)
     Intended Audience :: Developers
     Intended Audience :: Science/Research
     License :: OSI Approved :: Apache Software License
@@ -17,8 +17,8 @@ classifiers =
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
-    Topic :: Internet :: WWW/HTTP
-    Topic :: Internet :: WWW/HTTP :: Dynamic Content
+    Topic :: Utilities
+    Topic :: System :: Archiving :: Compression
     Topic :: Scientific/Engineering
     Topic :: Scientific/Engineering :: Astronomy