diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4066607a5b8db213bdca1a4d06cdbb3eee04bf77..aa9555fccabe52797d3ebb49b51db77678f63042 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,15 @@ cache:
 
 lint:
   stage: test
+  tags:
+   - openstack
   script: "./gradlew lint"
 
 
 test-frontend:
   stage: test
+  tags:
+   - openstack
   script: "./gradlew :frontend:test --parallel"
   artifacts:
     reports:
@@ -49,6 +53,8 @@ test-frontend:
 
 test-backend:
   stage: test
+  tags:
+   - openstack
   script: "./gradlew :backend:test --parallel"
   services:
     # even if that would be ideal
@@ -74,6 +80,8 @@ test-backend:
 
 
 build:
+  tags:
+   - openstack
   stage: build
   script:
     - ./gradlew assemble
@@ -205,4 +213,3 @@ deploy-to-prod-private:
     refs:
       - master
   when: manual
-
diff --git a/.secrets.baseline b/.secrets.baseline
index 8637f8a80c4060c5243e95f5a1e09f6896ae9725..e1fe1bd55f0b0715fd6f245104318ab38ccd8a51 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "frontend/package-lock.json|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2020-01-10T13:53:44Z",
+  "generated_at": "2020-03-25T17:24:29Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -48,10 +48,17 @@
   "results": {
     ".gitlab-ci.yml": [
       {
-        "hashed_secret": "7108e8d092c87038926f21e59c97942d3eb98c63",
+        "hashed_secret": "dd447c7c799dd4ebaacca8f0ad3da45a097d7211",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 29,
+        "line_number": 167,
+        "type": "Base64 High Entropy String"
+      },
+      {
+        "hashed_secret": "8074db38f8a8acec1a147bc5daf2799ff6693fff",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 182,
         "type": "Base64 High Entropy String"
       }
     ],