diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b26bd68e137b67635a9af748292603b3183a93f9..6aea1913bfd2460337fe1e4cdf2adfa87042ab03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,16 @@
 image: artefact.skatelescope.org/ska-tango-images/tango-itango:9.3.3.7
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  # The PBR dependency requires a set version, not actually used
   PBR_VERSION: "0.1"
 cache:
   paths:
     - .cache/pip
-    - .tox
-before_script:
-  - sudo apt-get update
-  - sudo apt-get install -y git
+    - devices/.tox
+.before_script_template: &before_unit_test
+  before_script:
+    - sudo apt-get update
+    - sudo apt-get install -y git
 stages:
   - linting
   - unit-tests
@@ -20,6 +22,7 @@ linting:
     - tox -e pep8
 unit_test:
   stage: unit-tests
+  <<: *before_unit_test
   script:
     - cd devices
-    - tox -e py37
\ No newline at end of file
+    - tox -e py37
diff --git a/devices/setup.cfg b/devices/setup.cfg
index 3b338be4eea38f05c1e3403b0b2366a672b4dc32..586aa190649d3c54b04ce586cdbaa4565570b1b1 100644
--- a/devices/setup.cfg
+++ b/devices/setup.cfg
@@ -1,15 +1,14 @@
 [metadata]
 name = TangoStationControl
 summary = LOFAR 2.0 Station Control
-#description-file =
-#    README.rst
+description-file =
+    README.md
 description-content-type = text/x-rst; charset=UTF-8
 author = ASTRON
-#home-page = https://dantalion.nl
-#project_urls =
-#    Bug Tracker = https://github.com/Dantali0n/RadLoggerPy/issues
-#    Documentation = https://docs.openstack.org/pbr/
-#    Source Code = https://github.com/Dantali0n/radloggerpy
+home-page = https://astron.nl
+project_urls =
+    Bug Tracker = https://support.astron.nl/jira/projects/L2SS/issues/
+    Source Code = https://git.astron.nl/lofar2.0/tango
 license = Apache-2
 classifier =
     Environment :: Console
@@ -23,11 +22,9 @@ classifier =
     Programming Language :: Python :: 3.9
 
 [files]
-packages =
-    ./
+package_dir=./
 
 [entry_points]
 console_scripts =
     SDP = SDP:main
     PCC = PCC:main
-
diff --git a/devices/setup.py b/devices/setup.py
index c9cac6d255e727d8a3eca85a860afae1d77d8afc..4fa0ce44d0caa9b174fc65a699e63b31e43aee9b 100644
--- a/devices/setup.py
+++ b/devices/setup.py
@@ -1,3 +1,4 @@
 import setuptools
 
+# Requires: setup.cfg
 setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)