diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b3543a2cf810daf33e779a344932ed4eae1a462..070451b115efe3ce6f39a25c117fb78f4f0b11a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ image: "${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME}"
 variables:
   SSH_KEY_ID: "411"
   HOSTNAME: "ci-$CI_PIPELINE_ID"
-  SUBDOMAIN: "ci.$HOSTNAME"
+  SUBDOMAIN: "$HOSTNAME.ci"
   DOMAIN: "openappstack.net"
   ADDRESS: "$SUBDOMAIN.$DOMAIN"
 
@@ -42,9 +42,10 @@ bootstrap:
     - chmod 755 ansible/
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - echo "subdomain: $SUBDOMAIN, domain: $DOMAIN, address: $ADDRESS"
     - python3 -m openappstack $HOSTNAME create --create-droplet $DOMAIN --hostname $HOSTNAME --ssh-key-id $SSH_KEY_ID --create-domain-records --subdomain $SUBDOMAIN
     - export ANSIBLE_HOST_KEY_CHECKING=False
-    - echo ssh-keyscan -t ssh-ed25519 "$SUBDOMAIN.$DOMAIN" > ~/.ssh/known_hosts
+    - echo ssh-keyscan -t ssh-ed25519 "$ADDRESS" > ~/.ssh/known_hosts
     - python3 -m openappstack $HOSTNAME install --ansible-param='--skip-tags=helmfile'
   artifacts:
     paths:
@@ -69,7 +70,7 @@ install:
     - chmod 755 ansible/
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - echo ssh-keyscan -t ssh-ed25519 "$SUBDOMAIN.$DOMAIN" > ~/.ssh/known_hosts
+    - echo ssh-keyscan -t ssh-ed25519 "$ADDRESS" > ~/.ssh/known_hosts
     - python3 -m openappstack $HOSTNAME install --ansible-param='--tags=helmfile'
     # Show versions of installed apps/binaries
     - ansible master -m shell -a 'oas-version-info.sh 2>&1'
@@ -107,7 +108,7 @@ testinfra:
 certs:
   stage: health-test
   variables:
-    OAS_DOMAIN: "$SUBDOMAIN.$DOMAIN"
+    OAS_DOMAIN: "$ADDRESS"
   allow_failure: true
   script:
     - eval $(ssh-agent -s)