diff --git a/Makefile b/Makefile
index c04261f..7447094 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,7 @@ deploy-locust: namespace
 	else \
 		echo "Helm release \"$(LOCUST_OPERATOR)\" already exists"; \
 	fi
+	kubectl wait --timeout=180s --namespace $(LOCUST_NAMESPACE) --for=condition=ready $$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -o name)
 
 ## Uninstall locust operator helm chart
 .PHONY: undeploy-locust
@@ -184,7 +185,7 @@ endif
 	cat locust-test-template.yaml | envsubst | kubectl apply --namespace $(LOCUST_NAMESPACE) -f -
 	kubectl create --namespace $(LOCUST_NAMESPACE) configmap locust.$(SCENARIO) --from-file scenarios/$(SCENARIO).py --dry-run=client -o yaml | kubectl apply --namespace $(LOCUST_NAMESPACE) -f -
 	date --utc -Ins>$(TMP_DIR)/benchmark-before
-	timeout=$$(date -d "480 seconds" "+%s"); while [ -z "$$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)" ]; do if [ "$$(date "+%s")" -gt "$$timeout" ]; then echo "ERROR: Timeout waiting for locust master pod to start"; exit 1; else echo "Waiting for locust master pod to start..."; sleep 5s; fi; done
+	timeout=$$(date -d "680 seconds" "+%s"); while [ -z "$$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)" ]; do if [ "$$(date "+%s")" -gt "$$timeout" ]; then echo "ERROR: Timeout waiting for locust master pod to start"; exit 1; else echo "Waiting for locust master pod to start..."; sleep 5s; fi; done
 	kubectl wait --namespace $(LOCUST_NAMESPACE) --for=condition=Ready=true $$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)
 	@echo "Getting locust master log:"
 	kubectl logs --namespace $(LOCUST_NAMESPACE) -f -l performance-test-pod-name=$(SCENARIO)-test-master | tee load-test.log
diff --git a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml
index 0d93bc5..ee0a0ed 100644
--- a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml
+++ b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml
@@ -61,7 +61,7 @@ upstream:
         valueFrom:
           secretKeyRef:
             key: backend-secret
-            name: "{{ .Release.Name }}-auth"
+            name: '{{ include "janus-idp.backend-secret-name" $ }}'
       - name: GITHUB_TOKEN
         valueFrom:
           secretKeyRef:
diff --git a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml
index b4de2be..67d7b98 100644
--- a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml
+++ b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml
@@ -61,7 +61,7 @@ upstream:
         valueFrom:
           secretKeyRef:
             key: backend-secret
-            name: "{{ .Release.Name }}-auth"
+            name: '{{ include "janus-idp.backend-secret-name" $ }}'
       - name: GITHUB_TOKEN
         valueFrom:
           secretKeyRef: