diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e69161fa503a01552855408ba55852faff44010..2cf1a89bee0dd544a829489b686a0088207e77bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,11 +12,11 @@ stages:
   - cleanup
 variables:
   SSH_KEY_ID: "411"
-  HOSTNAME: "ci-${CI_COMMIT_REF_SLUG}"
+  HOSTNAME: "${CI_COMMIT_REF_SLUG}"
   # Repeated values, because we're not allowed to use a variable in a variable
-  SUBDOMAIN: "ci-${CI_COMMIT_REF_SLUG}.ci"
+  SUBDOMAIN: "${CI_COMMIT_REF_SLUG}.ci"
   DOMAIN: "openappstack.net"
-  ADDRESS: "ci-${CI_COMMIT_REF_SLUG}.ci.openappstack.net"
+  ADDRESS: "${CI_COMMIT_REF_SLUG}.ci.openappstack.net"
   ANSIBLE_HOST_KEY_CHECKING: "False"
   KANIKO_BUILD_IMAGENAME: "openappstack-ci"
 
@@ -66,8 +66,8 @@ setup-kubernetes:
   script:
     # Copy inventory files to ansible folder for use in install-apps step
     - chmod 700 ansible
-    - cp clusters/ci-${CI_COMMIT_REF_SLUG}/inventory.yml ansible/
-    - cp clusters/ci-${CI_COMMIT_REF_SLUG}/settings.yml ansible/group_vars/all/
+    - cp clusters/${CI_COMMIT_REF_SLUG}/inventory.yml ansible/
+    - cp clusters/${CI_COMMIT_REF_SLUG}/settings.yml ansible/group_vars/all/
     # Set up cluster
     - python3 -m openappstack $HOSTNAME install --ansible-param='--skip-tags=helmfile'
   artifacts:
@@ -162,7 +162,7 @@ certs:
 prometheus-alerts:
   stage: health-test
   variables:
-    OAS_DOMAIN: 'ci-${CI_COMMIT_REF_SLUG}.ci.openappstack.net'
+    OAS_DOMAIN: '${CI_COMMIT_REF_SLUG}.ci.openappstack.net'
   allow_failure: true
   script:
     - cd test/
@@ -229,7 +229,7 @@ terminate_mr_droplet_after_merge:
       tmp="${commit_message#*\'}"
       merged_branch="${tmp%%\'*}"
       echo "Current HEAD is a merge commit, removing droplet from related merge request branch name '#${merged_branch}'."
-      python3 -c "import greenhost_cloud; greenhost_cloud.terminate_droplets_by_name(\"^ci-${merged_branch}\.\")"
+      python3 -c "import greenhost_cloud; greenhost_cloud.terminate_droplets_by_name(\"^${merged_branch}\.\")"
     else
       echo "Current HEAD is NOT a merge commit, nothing to do."
     fi
@@ -241,7 +241,7 @@ terminate_old_droplets:
   stage: cleanup
   script:
     - echo "Terminate droplets 5 days after creation. Branches that exist longer than 5 days will get a new droplet when CI runs again."
-    - python3 -c "import greenhost_cloud; greenhost_cloud.terminate_droplets_by_name(\"^ci-\", 5)"
+    - python3 -c "import greenhost_cloud; greenhost_cloud.terminate_droplets_by_name('\d+-.*', 5)"
   only:
     changes:
       - .gitlab-ci.yml