diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
index 18d31d8775f4f32d816b7a7c6f3172c7dd8046ec..5cce9898bbb6875d9ca3063f41ccb8b5c911a53d 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
@@ -11,8 +11,7 @@ yum-config-manager --enable ceph
 yum -y install cta-frontend cta-debuginfo cta-catalogueutils ceph-common
 fi
 
-# /etc/cta/cta-frontend-xrootd.conf is now provided by ctafrontend rpm and comes with
-# CI ready content
+# /etc/cta/cta-frontend-xrootd.conf is now provided by ctafrontend rpm and comes with CI-ready content
 
 /opt/run/bin/init_objectstore.sh
 . /tmp/objectstore-rc.sh
@@ -21,7 +20,6 @@ echo "ObjectStore BackendPath $OBJECTSTOREURL" > /etc/cta/cta-frontend.conf
 echo "Catalogue NumberOfConnections 10" >>/etc/cta/cta-frontend.conf
 echo "Log URL file:/var/log/cta/cta-frontend.log" >>/etc/cta/cta-frontend.conf
 
-
 /opt/run/bin/init_database.sh
 . /tmp/database-rc.sh
 
@@ -30,7 +28,10 @@ echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 # EOS INSTANCE NAME used as username for SSS key
 EOSINSTANCE=ctaeos
 
-# Wait for the keytab file to be pushed in by the creation script.
+# Wait for the keytab files to be pushed in by the creation script
+echo -n "Waiting for /etc/cta/eos.sss.keytab"
+for ((;;)); do test -e /etc/cta/eos.sss.keytab && break; sleep 1; echo -n .; done
+echo OK
 echo -n "Waiting for /etc/cta/cta-frontend.krb5.keytab"
 for ((;;)); do test -e /etc/cta/cta-frontend.krb5.keytab && break; sleep 1; echo -n .; done
 echo OK
diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh
index 8831cf786db5629d6a7a7c18d58f3e8a5fa07e9e..880c6b8e188addcb652a355ed294b07db74fd5bb 100755
--- a/continuousintegration/orchestration/create_instance.sh
+++ b/continuousintegration/orchestration/create_instance.sh
@@ -303,8 +303,14 @@ echo OK
 # The closew.CTA_retrieve workflow prevents the default workflow from receiving the closew event, as
 # we don't want to trigger the action of copying the retrived disk file to tape again. The
 # closew.CTA_retrieve workflow sets the CTA_retrieved_timestamp attribute.
+#
+# The FQDN can be set as follows:
+# CTA_ENDPOINT=ctafrontend.${instance}.svc.cluster.local:10955
+#
+# however the simple hostname should be sufficient:
+CTA_ENDPOINT=ctafrontend:10955
+
 echo "Setting workflows in namespace ${instance} pod ctaeos:"
-CTA_ENDPOINT=ctafrontend.${instance}.svc.cluster.local:10955
 CTA_WF_DIR=/eos/${EOSINSTANCE}/proc/cta/workflow
 for WORKFLOW in closew.default archived.default sync::prepare.default closew.CTA_retrieve sync::delete.default
 do