diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e20cd92aefd7c1be8795d33794e6bf3efd356fb..9416c99eb047993ab61278d5871a5b0b516dd776 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,8 @@ yamllint:
 #   tags:
 #   - heat
 #   before_script:
-#     - echo "$GC_KEY" > gc_key.pem
-#     - chmod 400 gc_key.pem
+#     - echo "$GC_KEY" > GC_KEY
+#     - chmod 400 GC_KEY
 #     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
 #   script:
 #     - echo "heat stage"
@@ -84,8 +84,8 @@ testlustre:
   - heat
   before_script:
     - cd $DEFAULT_PATH
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
+    #- echo "$GC_KEY" > GC_KEY
+    - chmod 400 GC_KEY
     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
     - sleep 60
   script:
@@ -96,7 +96,7 @@ testlustre:
     - python3 ../scripts/make_inventory.py static $STACKNAME | tee ./files/inventory.$STACKNAME && chmod 755 ./files/inventory.$STACKNAME
     - cd plays/testlustre
     - sleep 100
-    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem testlustre.yml
+    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../GC_KEY testlustre.yml
     - sleep 60
     - cd ../../
     - bash -x ./heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
@@ -110,12 +110,11 @@ build_cluster_cicd:
   - heat
   before_script:
     - cd $DEFAULT_PATH
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
+    - chmod 400 GC_KEY
     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
   script:
     - echo "heat stage"
-    - source ./$NECTAR_ALLOCATION-openrc.sh
+    #- source ./$NECTAR_ALLOCATION-openrc.sh
     - openstack stack list
     - bash -x ./heat/heatcicdwrapper.sh create_or_update $STACKNAME
     - bash -x ./heat/server_rebuild.sh all
@@ -133,31 +132,30 @@ ansible_create_cluster_stage:
   - ansible
   before_script:
     - cd $DEFAULT_PATH/..
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
+    - chmod 400 GC_KEY
     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
   script:
     - echo "ansible_create_cluster_stage"
     - bash -x ./CICD/ansible_create_cluster_script.sh
     - cd CICD
-    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../gc_key.pem --skip-tags SiteSpecific master_playbook.yml
+    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../GC_KEY --skip-tags SiteSpecific master_playbook.yml
     - sleep 15
     - echo uglyuglyfix
-    - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -b -a "systemctl restart slurmdbd" ManagementNodes
-    - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -b -a "systemctl restart slurmctld" ManagementNodes
+    - ansible -i files/inventory.$STACKNAME --key-file ../GC_KEY -b -a "systemctl restart slurmdbd" ManagementNodes
+    - ansible -i files/inventory.$STACKNAME --key-file ../GC_KEY -b -a "systemctl restart slurmctld" ManagementNodes
     - cd plays
-    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem --skip-tags monitoring computenodes.yml | tee nochange.log
+    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../GC_KEY --skip-tags monitoring computenodes.yml | tee nochange.log
     - echo [ `grep changed= ./nochange.log -c` = `grep changed=0 ./nochange.log -c` ] > bashtest.sh   # a crude way to make sure all changed lines are equal to changed=0
     - bash ./bashtest.sh
-    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem --skip-tags monitoring --check computenodes.yml
+    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../GC_KEY --skip-tags monitoring --check computenodes.yml
 
 tests:
   stage: tests
   tags:
   - ansible
   before_script:
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
+    #- echo "$GC_KEY" > GC_KEY
+    - chmod 400 GC_KEY
     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
   script:
     - echo "tests stage"
@@ -166,26 +164,26 @@ tests:
     - cd CICD
     - python3 ../scripts/make_inventory.py static $STACKNAME | tee ./files/inventory.$STACKNAME && chmod 755 ./files/inventory.$STACKNAME
     - grep -qv "I could not find any resouces tagged with project_name:" ./files/inventory.$STACKNAME   #fail if inventory file is empty
-    - ansible -m ping -i files/inventory.$STACKNAME --key-file ../gc_key.pem all
-    - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "sudo ls" all
+    - ansible -m ping -i files/inventory.$STACKNAME --key-file ../GC_KEY all
+    - ansible -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "sudo ls" all
     - echo -e '[defaults]\r\nallow_world_readable_tmpfiles = True' > ansible.cfg
-    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../gc_key.pem ./tests/mockSlurmData.yml
+    - ansible-playbook -i files/inventory.$STACKNAME --key-file ../GC_KEY ./tests/mockSlurmData.yml
     # Need to find a better check for sinfo
-    #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "find /opt/ -name sinfo -type f" ManagementNodes
-    #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "find /opt/ -name squeue -type f" ManagementNodes
-    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet mariadb" SQLNodes
-    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmctld" ManagementNodes
-    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmdbd" ManagementNodes
+    #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "find /opt/ -name sinfo -type f" ManagementNodes
+    #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "find /opt/ -name squeue -type f" ManagementNodes
+    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "systemctl is-active --quiet mariadb" SQLNodes
+    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "systemctl is-active --quiet slurmctld" ManagementNodes
+    - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../GC_KEY -a "systemctl is-active --quiet slurmdbd" ManagementNodes
 
 
-    - bash -e ./tests/run_tests.sh all "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh ComputeNodes "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh LoginNodes "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh ManagementNodes "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh NFSNodes "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh SQLNodes "files/inventory.$STACKNAME" "../gc_key.pem"
-    - bash -e ./tests/run_tests.sh slurm "files/inventory.$STACKNAME" "../gc_key.pem"
-    - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a 'sudo su - user1 -c whoami' LoginNodes,ComputeNodes  # to test ldap
+    - bash -e ./tests/run_tests.sh all "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh ComputeNodes "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh LoginNodes "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh ManagementNodes "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh NFSNodes "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh SQLNodes "files/inventory.$STACKNAME" "../GC_KEY"
+    - bash -e ./tests/run_tests.sh slurm "files/inventory.$STACKNAME" "../GC_KEY"
+    - ansible -i files/inventory.$STACKNAME --key-file ../GC_KEY -a 'sudo su - user1 -c whoami' LoginNodes,ComputeNodes  # to test ldap
     #- sshpass -p 'redhat' ssh -o StrictHostKeyChecking=no user1@server.example.com
 
 extended:
@@ -215,8 +213,8 @@ manual_cluster_spawn:
     - echo "for this to work you have to provide a variable called manual stackname"
     - echo I still need to handle os password
     - echo $MANUAL_STACKNAME
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
+    - echo "$GC_KEY" > GC_KEY
+    - chmod 400 GC_KEY
     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
   script:
     - source ./$NECTAR_ALLOCATION-openrc.sh
@@ -249,8 +247,8 @@ clean:
 #   tags:
 #   - heat
 #   before_script:
-#     - echo "$GC_KEY" > gc_key.pem
-#     - chmod 400 gc_key.pem
+#     - echo "$GC_KEY" > GC_KEY
+#     - chmod 400 GC_KEY
 #     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
 #     - source ./$NECTAR_ALLOCATION-openrc.sh
 #     - export HEAT_TEST_STACKNAME=_TESTING_HEAT