diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e26e88688f4e020b6b71322e396ac91c27b46a1..db3c554e8fda79601c6e46b2d96c8866947ddbd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,7 @@ terraform-single:
     - ln -sfv $TERRAFORM_CONFIG testsuite.auto.tfvars
     # https://github.com/terraform-provider-openstack/terraform-provider-openstack/issues/1160
     - touch ./secure.yml
+    - ip=`openstack floating ip create -c floating_ip_address -f value public-muni-147-251-21-GROUP`
   cache:
     when: always
     key: single
@@ -38,12 +39,13 @@ terraform-single:
       - "*.tfstate"
   script:
     - terraform init
-    - terraform apply -auto-approve -var type=hadoop-single -var flavor=standard.large -var n=0 -var domain=terra1 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
-    - ip=`jq -r .public_hosts.value.master < config.json`
+    - args="-auto-approve -var type=hadoop-single -var flavor=standard.large -var n=0 -var domain=terra1 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY -var floating_ip=$ip"
+    - terraform apply $args
     - eval $(ssh-agent -s)
     - ssh-add ./ssh-key.terra1.txt
     - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
-    - terraform destroy -auto-approve
+    - terraform destroy $args
+    - openstack floating ip delete $ip
   rules:
     - if: '$JOB =~ /all|test-single/'
   artifacts: &artifacts
@@ -61,12 +63,13 @@ terraform-cluster:
       - "*.tfstate"
   script:
     - terraform init
-    - terraform apply -auto-approve -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
-    - ip=`jq -r .public_hosts.value.master < config.json`
+    - args="-auto-approve -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY -var floating_ip=$ip"
+    - terraform apply $args
     - eval $(ssh-agent -s)
     - ssh-add ./ssh-key.terra2.txt
     - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
-    - terraform destroy -auto-approve
+    - terraform destroy $args
+    - openstack floating ip delete $ip
   rules:
     - if: '$JOB =~ /all|test-cluster/'
   artifacts: *artifacts