diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4cfeb85da9e06d39d0838ccb118ebcb0fcfde09..10946bbfce12da47d478c2ab9a9015bb78e8b08f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,6 +95,14 @@ tf-apply:
         TF_SUCCESS=true
       fi
       echo "Terraform success: $TF_SUCCESS"
+    - export instance_floating_ip=$(terraform output -raw floating_ip_ohpc)
+    - export instance_id=$(terraform output -raw xdmod_instance_id)
+    - echo "instance_floating_ip=${instance_floating_ip}" | tee -a $CI_PROJECT_DIR/vars.env
+    - echo "instance_id=${instance_id}" | tee -a $CI_PROJECT_DIR/vars.env
+  artifacts:
+    reports:
+      dotenv: vars.env
+
 
 staging-post-deploy:
   environment:
@@ -103,12 +111,8 @@ staging-post-deploy:
   tags: [build]
   script:
     - export staging_floating_ip="138.26.49.15"
-    - export instance_floating_ip=$(terraform output -raw floating_ip_ohpc)
-    - export instance_id=$(terraform output -raw xdmod_instance_id)
     - export old_instance_id=$(openstack floating ip show $staging_floating_ip -c port_details -f value | awk -F', ' '{print $2}' | awk -F"'" '{print $2}')
     - echo "staging_floating_ip=${staging_floating_ip}"
-    - echo "instance_floating_ip=${instance_floating_ip}"
-    - echo "instance_id=${instance_id}"
     - echo "old_instance_id=${old_instance_id}"
     - |
       if [[ -n "$old_instance_id" ]]; then