diff --git a/ci-scripts/rhdh-setup/create_resource.sh b/ci-scripts/rhdh-setup/create_resource.sh
index 876a23f..dbd5f9c 100755
--- a/ci-scripts/rhdh-setup/create_resource.sh
+++ b/ci-scripts/rhdh-setup/create_resource.sh
@@ -114,7 +114,7 @@ clone_and_upload() {
     curl -k "$(backstage_url)/api/catalog/locations" --cookie "$COOKIE" --cookie-jar "$COOKIE" -X POST -H 'Accept-Encoding: gzip, deflate, br' -H 'Authorization: Bearer '"$ACCESS_TOKEN" -H 'Content-Type: application/json' --data-raw '{"type":"url","target":"'"${upload_url}"'"}'
 
 
-    timeout_timestamp=$(date -d "600 seconds" "+%s")
+    timeout_timestamp=$(date -d "7200 seconds" "+%s")
     while true; do
       if [ "$(date "+%s")" -gt "$timeout_timestamp" ]; then
         echo "ERROR: Timeout waiting on entity count"
@@ -125,7 +125,7 @@ clone_and_upload() {
         if [[ $b_count -ge $e_count ]]; then break; fi
       fi
       echo "Waiting for the entity count to be ${e_count} (current: ${b_count})"
-      sleep 10s
+      sleep 120s
     done
   done
   for filename in "${files[@]}"; do
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 67d7b98..38a28ef 100644
--- a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml
+++ b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml
@@ -1,4 +1,7 @@
 global:
+  auth:
+    backend:
+      enabled: true
   clusterRouterBase: ${OPENSHIFT_APP_DOMAIN}
   imagePullSecrets:
     - rhdh-pull-secret
@@ -31,21 +34,16 @@ upstream:
             password: "${POSTGRESQL_ADMIN_PASSWORD}"
             user: postgres
         auth:
+          keys:
+            - secret: '${BACKEND_SECRET}'
           externalAccess:
             - type: legacy
               options:
                 secret: ${BACKEND_SECRET}
                 subject: legacy-catalog
     args:
-      - "--config"
-      - app-config.yaml
-      - "--config"
-      - app-config.example.yaml
-      - "--config"
-      - app-config.example.production.yaml
-    command:
-      - node
-      - packages/backend
+      - '--config'
+      - dynamic-plugins-root/app-config.dynamic-plugins.yaml
     containerPorts:
       backend: 7007
     extraAppConfig:
@@ -87,7 +85,7 @@ upstream:
         value: "warn"
       - name: NODE_TLS_REJECT_UNAUTHORIZED
         value: "0"
-    installDir: /app
+    installDir: /opt/app-root/src
     replicas: ${RHDH_DEPLOYMENT_REPLICAS}
     revisionHistoryLimit: 10
   clusterDomain: cluster.local
diff --git a/test.env b/test.env
index 764a2ab..bdf7b25 100644
--- a/test.env
+++ b/test.env
@@ -54,3 +54,20 @@
 ## Extras
 # export LOCUST_EXTRA_CMD=
 # export ARTIFACT_DIR=.artifacts
+
+export DURATION=5m
+export PRE_LOAD_DB="true"
+export SCALE_ACTIVE_USERS_SPAWN_RATES='1:1 10:2 20:4 50:10 100:20 200:40 500:100 1000:200'
+export SCALE_BS_USERS_GROUPS='10000:2000'
+export SCALE_CATALOG_SIZES='2500:2500'
+export SCALE_CPU_REQUESTS_LIMITS=:
+export SCALE_DB_STORAGES=2Gi
+export SCALE_MEMORY_REQUESTS_LIMITS=:
+export SCALE_REPLICAS=5
+export SCALE_WORKERS=40
+export SCENARIO=mvp
+export USE_PR_BRANCH=true
+export WAIT_FOR_SEARCH_INDEX=false
+export RHDH_HELM_CHART=redhat-developer-hub
+export AUTH_PROVIDER=keycloak
+export RHDH_HELM_REPO=https://charts.openshift.io/