diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00c18a452ab91c0956ebae625323ad483ae36fdc..4df93ade82748bec7c1871ce6a3434062ee23f25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,8 +307,11 @@ setup-openappstack:
     # Set up cluster
     # TODO: I set --no-install-openappstack to skip the old installation procedure, should be removed eventually
     - python3 -m openappstack $HOSTNAME install --install-kubernetes --no-install-openappstack
+    # export IP_ADDRESS and FQDN vars
+    - source clusters/${CI_COMMIT_REF_SLUG}/.cluster.env
     - cp install/.env.example  clusters/${CI_COMMIT_REF_SLUG}/.env
-    - sed "s/1.2.3.4/$IP_ADDRESS/; s/example.org/$FQDN/" clusters/${CI_COMMIT_REF_SLUG}/.env
+    - sed -i "s/1.2.3.4/$IP_ADDRESS/; s/example.org/$FQDN/" clusters/${CI_COMMIT_REF_SLUG}/.env
+    - cat clusters/${CI_COMMIT_REF_SLUG}/.env
     - source clusters/${CI_COMMIT_REF_SLUG}/.env
     - install/install-openappstack.sh
     # TODO: Should also be removed or made up-to-date