diff --git a/cinder_controller/admin-openrc.sh b/cinder_controller/admin-openrc.sh
index 9013f2e..f391767 100644
--- a/cinder_controller/admin-openrc.sh
+++ b/cinder_controller/admin-openrc.sh
@@ -9,7 +9,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_USERNAME=admin
 export OS_PASSWORD=geheim
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 
 export OS_PROJECT_DOMAIN_NAME=default
 export OS_USER_DOMAIN_NAME=default
diff --git a/cinder_controller/bootstrap.sh b/cinder_controller/bootstrap.sh
index d815fe6..0941d82 100755
--- a/cinder_controller/bootstrap.sh
+++ b/cinder_controller/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/cinder_storage/admin-openrc.sh b/cinder_storage/admin-openrc.sh
index 9013f2e..f391767 100644
--- a/cinder_storage/admin-openrc.sh
+++ b/cinder_storage/admin-openrc.sh
@@ -9,7 +9,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_USERNAME=admin
 export OS_PASSWORD=geheim
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 
 export OS_PROJECT_DOMAIN_NAME=default
 export OS_USER_DOMAIN_NAME=default
diff --git a/cinder_storage/bootstrap.sh b/cinder_storage/bootstrap.sh
index edb935c..6ab2419 100755
--- a/cinder_storage/bootstrap.sh
+++ b/cinder_storage/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/glance/admin-openrc.sh b/glance/admin-openrc.sh
index 009dc93..d085f31 100644
--- a/glance/admin-openrc.sh
+++ b/glance/admin-openrc.sh
@@ -8,7 +8,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_USERNAME=admin
 export OS_PASSWORD=geheim
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 
 export OS_PROJECT_DOMAIN_NAME=default
 export OS_USER_DOMAIN_NAME=default
diff --git a/glance/bootstrap.sh b/glance/bootstrap.sh
index 6b51a70..00265c2 100755
--- a/glance/bootstrap.sh
+++ b/glance/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export GLANCE_USER_NAME=glance
diff --git a/heat/admin-openrc.sh b/heat/admin-openrc.sh
index 2485c88..1ca1d72 100644
--- a/heat/admin-openrc.sh
+++ b/heat/admin-openrc.sh
@@ -5,7 +5,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_USERNAME=admin
 export OS_PASSWORD=geheim
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 
 export OS_PROJECT_DOMAIN_NAME=default
 export OS_USER_DOMAIN_NAME=default
diff --git a/heat/bootstrap.sh b/heat/bootstrap.sh
index 7c75f1c..aa1bcce 100755
--- a/heat/bootstrap.sh
+++ b/heat/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export HEAT_USER=heat
diff --git a/horizon/admin-openrc.sh b/horizon/admin-openrc.sh
index 2485c88..1ca1d72 100644
--- a/horizon/admin-openrc.sh
+++ b/horizon/admin-openrc.sh
@@ -5,7 +5,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_USERNAME=admin
 export OS_PASSWORD=geheim
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 
 export OS_PROJECT_DOMAIN_NAME=default
 export OS_USER_DOMAIN_NAME=default
diff --git a/keystone/bootstrap.sh b/keystone/bootstrap.sh
index 041f602..1103ab7 100755
--- a/keystone/bootstrap.sh
+++ b/keystone/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://${KEYSTONE_HOST}:35357/v3
 export OS_IDENTITY_API_VERSION=3
 EOF
 
@@ -16,7 +16,7 @@ cat << EOF > /root/demo-openrc.sh
 export OS_TENANT_NAME=demo
 export OS_USERNAME=demo
 export OS_PASSWORD=${OS_DEMO_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://${KEYSTONE_HOST}:35357/v3
 export OS_IDENTITY_API_VERSION=3
 EOF
 
diff --git a/neutron_controller/bootstrap.sh b/neutron_controller/bootstrap.sh
index 065a6c6..ed539b0 100755
--- a/neutron_controller/bootstrap.sh
+++ b/neutron_controller/bootstrap.sh
@@ -11,7 +11,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/neutron_controller_ovs/bootstrap.sh b/neutron_controller_ovs/bootstrap.sh
index 065a6c6..ed539b0 100755
--- a/neutron_controller_ovs/bootstrap.sh
+++ b/neutron_controller_ovs/bootstrap.sh
@@ -11,7 +11,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/nova_compute/write_conf.sh b/nova_compute/write_conf.sh
index 8620fbf..b4ed63c 100755
--- a/nova_compute/write_conf.sh
+++ b/nova_compute/write_conf.sh
@@ -8,7 +8,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/nova_service/bootstrap.sh b/nova_service/bootstrap.sh
index 03c8685..be284f1 100755
--- a/nova_service/bootstrap.sh
+++ b/nova_service/bootstrap.sh
@@ -13,7 +13,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 
 export OS_PROJECT_DOMAIN_NAME=default
diff --git a/openstack_client/bootstrap.sh b/openstack_client/bootstrap.sh
index b217b39..bad9cba 100755
--- a/openstack_client/bootstrap.sh
+++ b/openstack_client/bootstrap.sh
@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=${OS_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 EOF
 
@@ -16,6 +16,6 @@ cat << EOF > /root/demo-openrc.sh
 export OS_TENANT_NAME=demo
 export OS_USERNAME=demo
 export OS_PASSWORD=${OS_DEMO_PASSWORD}
-export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3
+export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
 export OS_IDENTITY_API_VERSION=3
 EOF