diff --git a/Makefile b/Makefile
index 25cbfd1..309aa8e 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ export RHDH_HELM_CHART_VERSION ?=
 export RHDH_HELM_RELEASE_NAME ?= rhdh
 
 # RHDH OLM subscription to deploy
-export RHDH_OLM_INDEX_IMAGE ?= quay.io/rhdh/iib:1.2-v$(shell oc version -o json | jq -r '.openshiftVersion' | sed -r -e "s,([0-9]+\.[0-9]+)\..+,\1,")-$(shell oc version -o json | jq -r '.serverVersion.platform' | sed -r -e "s,linux/,," | sed -e 's,amd64,x86_64,')
-export RHDH_OLM_CHANNEL ?= fast
+export RHDH_OLM_INDEX_IMAGE ?= registry.redhat.io/redhat/redhat-operator-index:v$(shell oc version -o json | jq -r '.openshiftVersion' | sed -r -e "s,([0-9]+\.[0-9]+)\..+,\1,")
+export RHDH_OLM_CHANNEL ?= fast-1.2
 
 # RHDH horizontal scaling
 export RHDH_DEPLOYMENT_REPLICAS ?= 1
@@ -48,7 +48,7 @@ export RHDH_RESOURCES_MEMORY_REQUESTS ?=
 export RHDH_RESOURCES_MEMORY_LIMITS ?=
 export RHDH_KEYCLOAK_REPLICAS ?= 1
 export LOCUST_EXTRA_CMD ?=
-export AUTH_PROVIDER ?=
+export AUTH_PROVIDER ?= keycloak
 
 # RHDH install method - one of 'helm' or 'olm'
 export RHDH_INSTALL_METHOD ?= helm
@@ -175,7 +175,7 @@ test: $(TMP_DIR) $(ARTIFACT_DIR)
 ifneq ($(shell test '$(AUTH_PROVIDER)' == 'keycloak' && echo 1 || echo 0),0)
 	$(eval key_pass := $(shell oc -n  rhdh-performance  get secret perf-test-secrets -o template --template='{{.data.keycloak_user_pass}}' | base64 -d))
 	$(eval key_host := $(shell oc  -n  rhdh-performance  get routes/keycloak -o template  --template='{{.spec.host}}' ))
-	$(eval LOCUST_EXTRA_CMD := --keycloak-host $(key_host) --keycloak-password $(key_pass)  )
+	$(eval LOCUST_EXTRA_CMD := $(LOCUST_EXTRA_CMD) --keycloak-host $(key_host) --keycloak-password $(key_pass)  )
 ifneq ($(shell test $(USERS) -gt $(WORKERS) && echo 1 || echo 0),0)
 	@echo "users greater than  workers "
 else
diff --git a/ci-scripts/dev-sandbox/Makefile b/ci-scripts/dev-sandbox/Makefile
index b63337f..556a83e 100644
--- a/ci-scripts/dev-sandbox/Makefile
+++ b/ci-scripts/dev-sandbox/Makefile
@@ -1,8 +1,8 @@
 #SHELL="/bin/bash -x"
 
-export RHDH_OLM_INDEX_IMAGE ?= quay.io/rhdh/iib:1.2-v4.15-x86_64
+export RHDH_OLM_INDEX_IMAGE ?= registry.redhat.io/redhat/redhat-operator-index:v4.15
 export RHDH_OPERATOR_NAMESPACE ?= rhdh-operator
-export RHDH_OLM_CHANNEL ?= fast
+export RHDH_OLM_CHANNEL ?= fast-1.2
 export RHDH_OLM_OPERATOR_PACKAGE ?= rhdh
 
 export ARTIFACT_DIR ?=
diff --git a/ci-scripts/dev-sandbox/run.sh b/ci-scripts/dev-sandbox/run.sh
index c6c533c..1c95d3a 100755
--- a/ci-scripts/dev-sandbox/run.sh
+++ b/ci-scripts/dev-sandbox/run.sh
@@ -44,7 +44,11 @@ collect_counts "baseline-counts-post"
 
 # testing env
 if [ "$RHDH_INSTALL_METHOD" == "olm" ]; then
-    rhdh_route="backstage-developer-hub"
+    if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+        rhdh_route="rhdh"
+    else
+        rhdh_route="backstage-developer-hub"
+    fi
 elif [ "$RHDH_INSTALL_METHOD" == "helm" ]; then
     export RHDH_HELM_RELEASE_NAME RHDH_HELM_CHART
 
diff --git a/ci-scripts/rhdh-setup/create_resource.sh b/ci-scripts/rhdh-setup/create_resource.sh
index 5e7675d..51f020e 100755
--- a/ci-scripts/rhdh-setup/create_resource.sh
+++ b/ci-scripts/rhdh-setup/create_resource.sh
@@ -45,7 +45,11 @@ backstage_url() {
     if [ "$RHDH_INSTALL_METHOD" == "helm" ]; then
       rhdh_route="${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}"
     else
-      rhdh_route="backstage-developer-hub"
+      if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+        rhdh_route="rhdh"
+      else
+        rhdh_route="backstage-developer-hub"
+      fi
     fi
     echo -n "https://$(oc get routes "${rhdh_route}" -n "${RHDH_NAMESPACE}" -o jsonpath='{.spec.host}')" >"$f"
   fi
@@ -149,14 +153,27 @@ create_cmp() {
 }
 
 create_group() {
-  token=$(get_token)
-  groupname="group${0}"
-  echo "    g, group:default/${groupname}, role:default/perf_admin" >>"$TMP_DIR/group-rbac.yaml"
-  curl -s -k --location --request POST "$(keycloak_url)/auth/admin/realms/backstage/groups" \
-    -H 'Content-Type: application/json' \
-    -H 'Authorization: Bearer '"$token" \
-    --data-raw '{"name": "'"${groupname}"'"}' |& tee -a "$TMP_DIR/create_group.log"
-  echo "[INFO][$(date --utc -Ins)] Group $groupname created" >>"$TMP_DIR/create_group.log"
+  max_attempts=5
+  attempt=1
+  while ((attempt <= max_attempts)); do
+    token=$(get_token)
+    groupname="group${0}"
+    echo "    g, group:default/${groupname}, role:default/perf_admin" >>"$TMP_DIR/group-rbac.yaml"
+    curl -s -k --location --request POST "$(keycloak_url)/auth/admin/realms/backstage/groups" \
+      -H 'Content-Type: application/json' \
+      -H 'Authorization: Bearer '"$token" \
+      --data-raw '{"name": "'"${groupname}"'"}' |& tee -a "$TMP_DIR/create_group.log"
+    if [ "${PIPESTATUS[0]}" -eq 0 ]; then
+      echo "[INFO][$(date --utc -Ins)] Group $groupname created" >>"$TMP_DIR/create_group.log"
+      return
+    else
+      echo "[WARNING][$(date --utc -Ins)] Unable to create the $groupname group at $attempt. attempt. Trying again up to $max_attempts times." >>"$TMP_DIR/create_group.log"
+      ((attempt++))
+    fi
+  done
+  if [[ $attempt -gt $max_attempts ]]; then
+    echo "[ERROR][$(date --utc -Ins)] Unable to create the $groupname group in $max_attempts attempts, giving up!" |& tee -a "$TMP_DIR/create_group.log"
+  fi
 }
 
 create_groups() {
@@ -166,16 +183,29 @@ create_groups() {
 }
 
 create_user() {
-  token=$(get_token)
-  grp=$(echo "${0}%${GROUP_COUNT}" | bc)
-  [[ $grp -eq 0 ]] && grp=${GROUP_COUNT}
-  username="test${0}"
-  groupname="group${grp}"
-  curl -s -k --location --request POST "$(keycloak_url)/auth/admin/realms/backstage/users" \
-    -H 'Content-Type: application/json' \
-    -H 'Authorization: Bearer '"$token" \
-    --data-raw '{"firstName":"'"${username}"'","lastName":"tester", "email":"'"${username}"'@test.com","emailVerified":"true", "enabled":"true", "username":"'"${username}"'","groups":["/'"${groupname}"'"],"credentials":[{"type":"password","value":"'"${KEYCLOAK_USER_PASS}"'","temporary":false}]}' |& tee -a "$TMP_DIR/create_user.log"
-  echo "[INFO][$(date --utc -Ins)] User $username ($groupname) created" >>"$TMP_DIR/create_user.log"
+  max_attempts=5
+  attempt=1
+  while ((attempt <= max_attempts)); do
+    token=$(get_token)
+    grp=$(echo "${0}%${GROUP_COUNT}" | bc)
+    [[ $grp -eq 0 ]] && grp=${GROUP_COUNT}
+    username="test${0}"
+    groupname="group${grp}"
+    curl -s -k --location --request POST "$(keycloak_url)/auth/admin/realms/backstage/users" \
+      -H 'Content-Type: application/json' \
+      -H 'Authorization: Bearer '"$token" \
+      --data-raw '{"firstName":"'"${username}"'","lastName":"tester", "email":"'"${username}"'@test.com","emailVerified":"true", "enabled":"true", "username":"'"${username}"'","groups":["/'"${groupname}"'"],"credentials":[{"type":"password","value":"'"${KEYCLOAK_USER_PASS}"'","temporary":false}]}' |& tee -a "$TMP_DIR/create_user.log"
+    if [ "${PIPESTATUS[0]}" -eq 0 ]; then
+      echo "[INFO][$(date --utc -Ins)] User $username ($groupname) created" >>"$TMP_DIR/create_user.log"
+      return
+    else
+      echo "[WARNING][$(date --utc -Ins)] Unable to create the $username user at $attempt. attempt. Trying again up to $max_attempts times." >>"$TMP_DIR/create_user.log"
+      ((attempt++))
+    fi
+  done
+  if [[ $attempt -gt $max_attempts ]]; then
+    echo "[ERROR][$(date --utc -Ins)] Unable to create the $username user in $max_attempts attempts, giving up!" |& tee -a "$TMP_DIR/create_user.log"
+  fi
 }
 
 create_users() {
@@ -267,19 +297,20 @@ get_token() {
   trap "rm -rf $token_lockfile; exit" INT TERM EXIT HUP
 
   timeout_timestamp=$(date -d "60 seconds" "+%s")
-  while [ ! -f "$token_file" ] || [ ! -s "$token_file" ] || [ "$(date +%s)" -gt "$(jq -rc '.expires_in_timestamp' "$token_file")" ]; do
+  while [ ! -f "$token_file" ] || [ ! -s "$token_file" ] || [ -z "$(jq -rc '.expires_in_timestamp' "$token_file")" ] || [ "$(date +%s)" -gt "$(jq -rc '.expires_in_timestamp' "$token_file")" ]; do
     log_token_info "Refreshing keycloak token"
     if [ "$(date "+%s")" -gt "$timeout_timestamp" ]; then
       log_token_err "Timeout getting keycloak token"
       exit 1
     fi
     if [[ ${service} == 'rhdh' ]]; then
+      log_token_info "Refreshing RHDH token"
       [[ -f "$token_file" ]] && rm -rf "$token_file" && rm -rf "$TMP_DIR/cookie.jar"
       if ! rhdh_token >"$token_file"; then
         log_token_err "Unable to get token, re-attempting"
       fi
     else
-      keycloak_pass=$(oc -n "${RHDH_NAMESPACE}" get secret credential-example-sso -o template --template='{{.data.ADMIN_PASSWORD}}' | base64 -d)
+      keycloak_pass=$(oc -n "${RHDH_NAMESPACE}" get secret credential-rhdh-sso -o template --template='{{.data.ADMIN_PASSWORD}}' | base64 -d)
       if ! keycloak_token >"$token_file"; then
         log_token_err "Unable to get token, re-attempting"
       fi
diff --git a/ci-scripts/rhdh-setup/deploy.sh b/ci-scripts/rhdh-setup/deploy.sh
index 1c13739..68ae2b7 100755
--- a/ci-scripts/rhdh-setup/deploy.sh
+++ b/ci-scripts/rhdh-setup/deploy.sh
@@ -41,9 +41,9 @@ export RHDH_HELM_CHART=${RHDH_HELM_CHART:-redhat-developer-hub}
 export RHDH_HELM_CHART_VERSION=${RHDH_HELM_CHART_VERSION:-}
 
 OCP_VER="$(oc version -o json | jq -r '.openshiftVersion' | sed -r -e "s#([0-9]+\.[0-9]+)\..+#\1#")"
-OCP_ARCH="$(oc version -o json | jq -r '.serverVersion.platform' | sed -r -e "s#linux/##" | sed -e 's#amd64#x86_64#')"
-export RHDH_OLM_INDEX_IMAGE="${RHDH_OLM_INDEX_IMAGE:-quay.io/rhdh/iib:1.2-v${OCP_VER}-${OCP_ARCH}}"
-export RHDH_OLM_CHANNEL=${RHDH_OLM_CHANNEL:-fast}
+#OCP_ARCH="$(oc version -o json | jq -r '.serverVersion.platform' | sed -r -e "s#linux/##" | sed -e 's#amd64#x86_64#')"
+export RHDH_OLM_INDEX_IMAGE="${RHDH_OLM_INDEX_IMAGE:-registry.redhat.io/redhat/redhat-operator-index:v${OCP_VER}}"
+export RHDH_OLM_CHANNEL=${RHDH_OLM_CHANNEL:-fast-1.2}
 export RHDH_OLM_OPERATOR_PACKAGE=${RHDH_OLM_OPERATOR_PACKAGE:-rhdh}
 
 export PRE_LOAD_DB="${PRE_LOAD_DB:-true}"
@@ -173,6 +173,15 @@ keycloak_install() {
     envsubst <template/keycloak/keycloak.yaml | $clin apply -f -
     wait_to_start statefulset keycloak 450 600
     envsubst <template/keycloak/keycloakRealm.yaml | $clin apply -f -
+    if [ "$INSTALL_METHOD" == "helm" ]; then
+        export OAUTH2_REDIRECT_URI=https://${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}/oauth2/callback
+    elif [ "$INSTALL_METHOD" == "olm" ]; then
+        if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+            export OAUTH2_REDIRECT_URI=https://rhdh-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}/oauth2/callback
+        else
+            export OAUTH2_REDIRECT_URI=https://backstage-developer-hub-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}/oauth2/callback
+        fi
+    fi
     envsubst <template/keycloak/keycloakClient.yaml | $clin apply -f -
     envsubst <template/keycloak/keycloakUser.yaml | $clin apply -f -
 }
@@ -197,6 +206,18 @@ backstage_install() {
     cp "template/backstage/app-config.yaml" "$TMP_DIR/app-config.yaml"
     if [ "${AUTH_PROVIDER}" == "keycloak" ]; then yq -i '. |= . + {"signInPage":"oauth2Proxy"}' "$TMP_DIR/app-config.yaml"; fi
     if [ "${AUTH_PROVIDER}" == "keycloak" ]; then yq -i '. |= . + {"auth":{"environment":"production","providers":{"oauth2Proxy":{}}}}' "$TMP_DIR/app-config.yaml"; else yq -i '. |= . + {"auth":{"providers":{"guest":{"dangerouslyAllowOutsideDevelopment":true}}}}' "$TMP_DIR/app-config.yaml"; fi
+    if [ "$INSTALL_METHOD" == "helm" ]; then
+        base_url="https://${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}"
+    elif [ "$INSTALL_METHOD" == "olm" ]; then
+        if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+            base_url="https://rhdh-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}"
+        else
+            base_url="https://backstage-developer-hub-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}"
+        fi
+    fi
+    yq -i '.app.baseUrl="'"$base_url"'"' "$TMP_DIR/app-config.yaml"
+    yq -i '.backend.baseUrl="'"$base_url"'"' "$TMP_DIR/app-config.yaml"
+    yq -i '.backend.cors.origin="'"$base_url"'"' "$TMP_DIR/app-config.yaml"
     until envsubst <template/backstage/secret-rhdh-pull-secret.yaml | $clin apply -f -; do $clin delete secret rhdh-pull-secret --ignore-not-found=true; done
     if ${ENABLE_RBAC}; then yq -i '. |= . + load("template/backstage/'$INSTALL_METHOD'/app-rbac-patch.yaml")' "$TMP_DIR/app-config.yaml"; fi
     until $clin create configmap app-config-rhdh --from-file "app-config.rhdh.yaml=$TMP_DIR/app-config.yaml"; do $clin delete configmap app-config-rhdh --ignore-not-found=true; done
@@ -215,7 +236,7 @@ backstage_install() {
         return 1
     fi
     if [ "${AUTH_PROVIDER}" == "keycloak" ] && ${RHDH_METRIC}; then $clin create -f template/backstage/rhdh-metrics-service.yaml; fi
-    if ${RHDH_METRIC}; then envsubst <template/backstage/rhdh-servicemonitor.yaml| $clin create -f -; fi
+    if ${RHDH_METRIC}; then envsubst <template/backstage/rhdh-servicemonitor.yaml | $clin create -f -; fi
 }
 
 # shellcheck disable=SC2016,SC1004
@@ -292,6 +313,10 @@ install_rhdh_with_olm() {
     set +x
     wait_for_crd backstages.rhdh.redhat.com
 
+    if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+        envsubst <template/backstage/olm/rhdh-oauth2.deployment.yaml | $clin apply -f -
+    fi
+
     backstage_yaml="$TMP_DIR/backstage.yaml"
     envsubst <template/backstage/olm/backstage.yaml >"$backstage_yaml"
     if ${ENABLE_RBAC}; then
diff --git a/ci-scripts/rhdh-setup/template/backstage/olm/rhdh-oauth2.deployment.yaml b/ci-scripts/rhdh-setup/template/backstage/olm/rhdh-oauth2.deployment.yaml
new file mode 100644
index 0000000..d9e8005
--- /dev/null
+++ b/ci-scripts/rhdh-setup/template/backstage/olm/rhdh-oauth2.deployment.yaml
@@ -0,0 +1,88 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rhdh
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: oauth2
+      app.kubernetes.io/instance: rhdh
+      app.kubernetes.io/name: developer-hub
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: oauth2
+        app.kubernetes.io/instance: rhdh
+        app.kubernetes.io/name: developer-hub
+    spec:
+      containers:
+        - args:
+            - --provider=oidc
+            - --email-domain=*
+            - --upstream=http://backstage-developer-hub:80
+            - --http-address=0.0.0.0:4180
+            - --skip-provider-button
+          env:
+            - name: OAUTH2_PROXY_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  key: CLIENT_ID
+                  name: keycloak-client-secret-backstage
+            - name: OAUTH2_PROXY_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  key: CLIENT_SECRET
+                  name: keycloak-client-secret-backstage
+            - name: OAUTH2_PROXY_COOKIE_SECRET
+              valueFrom:
+                secretKeyRef:
+                  key: keycloak_cookie_secret
+                  name: perf-test-secrets
+            - name: OAUTH2_PROXY_OIDC_ISSUER_URL
+              value: https://keycloak-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}/auth/realms/backstage
+            - name: OAUTH2_PROXY_SSL_INSECURE_SKIP_VERIFY
+              value: "true"
+          image: quay.io/oauth2-proxy/oauth2-proxy:latest
+          imagePullPolicy: IfNotPresent
+          name: oauth2-proxy
+          ports:
+            - containerPort: 4180
+              name: oauth2-proxy
+              protocol: TCP
+          resources: {}
+      imagePullSecrets:
+        - name: rhdh-pull-secret
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: rhdh
+spec:
+  ports:
+    - name: oauth2-proxy
+      port: 4180
+      protocol: TCP
+      targetPort: oauth2-proxy
+  selector:
+    app.kubernetes.io/component: oauth2
+    app.kubernetes.io/instance: rhdh
+    app.kubernetes.io/name: developer-hub
+  type: ClusterIP
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: rhdh
+spec:
+  path: /
+  port:
+    targetPort: 4180
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: rhdh
+    weight: 100
+  wildcardPolicy: None
diff --git a/ci-scripts/rhdh-setup/template/keycloak/keycloak.yaml b/ci-scripts/rhdh-setup/template/keycloak/keycloak.yaml
index 8b5a43e..b1ff5c7 100644
--- a/ci-scripts/rhdh-setup/template/keycloak/keycloak.yaml
+++ b/ci-scripts/rhdh-setup/template/keycloak/keycloak.yaml
@@ -1,7 +1,7 @@
 apiVersion: keycloak.org/v1alpha1
 kind: Keycloak
 metadata:
-  name: example-sso
+  name: rhdh-sso
   labels:
     app: sso
 spec:
diff --git a/ci-scripts/rhdh-setup/template/keycloak/keycloakClient.yaml b/ci-scripts/rhdh-setup/template/keycloak/keycloakClient.yaml
index 553e47f..ba47c60 100644
--- a/ci-scripts/rhdh-setup/template/keycloak/keycloakClient.yaml
+++ b/ci-scripts/rhdh-setup/template/keycloak/keycloakClient.yaml
@@ -17,7 +17,7 @@ spec:
     implicitFlowEnabled: false
     publicClient: false
     redirectUris:
-      - https://${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}-${RHDH_NAMESPACE}.${OPENSHIFT_APP_DOMAIN}/oauth2/callback
+      - ${OAUTH2_REDIRECT_URI}
     serviceAccountsEnabled: true
     standardFlowEnabled: true
   realmSelector:
diff --git a/ci-scripts/scalability/test-scalability.sh b/ci-scripts/scalability/test-scalability.sh
index 5218552..7b63e4a 100755
--- a/ci-scripts/scalability/test-scalability.sh
+++ b/ci-scripts/scalability/test-scalability.sh
@@ -46,12 +46,14 @@ wait_for_indexing() {
     COOKIE="$TMP_DIR/cookie.jar"
     if [ "$INSTALL_METHOD" == "helm" ]; then
         rhdh_route="${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}"
-        #rhdh_route="rhdh-redhat-developer-hub"
     else
-        rhdh_route="backstage-developer-hub"
+        if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+            rhdh_route="rhdh"
+        else
+            rhdh_route="backstage-developer-hub"
+        fi
     fi
     if [ "$WAIT_FOR_SEARCH_INDEX" == "true" ]; then
-        rhdh_route="${RHDH_HELM_RELEASE_NAME}-${RHDH_HELM_CHART}"
         HOST="https://$(oc get routes "${rhdh_route}" -n "${RHDH_NAMESPACE:-rhdh-performance}" -o jsonpath='{.spec.host}')"
 
         start=$(date +%s)
diff --git a/ci-scripts/setup.sh b/ci-scripts/setup.sh
index 88d874b..e79c529 100755
--- a/ci-scripts/setup.sh
+++ b/ci-scripts/setup.sh
@@ -17,10 +17,10 @@ GITHUB_USER=$(cat /usr/local/ci-secrets/backstage-performance/github.user)
 GITHUB_REPO=$(cat /usr/local/ci-secrets/backstage-performance/github.repo)
 QUAY_TOKEN=$(cat /usr/local/ci-secrets/backstage-performance/quay.token)
 
-export RHDH_DEPLOYMENT_REPLICAS=${RHDH_DEPLOYMENT_REPLICAS:-5}
-export RHDH_DB_REPLICAS=${RHDH_DB_REPLICAS:-5}
+export RHDH_DEPLOYMENT_REPLICAS=${RHDH_DEPLOYMENT_REPLICAS:-1}
+export RHDH_DB_REPLICAS=${RHDH_DB_REPLICAS:-1}
 export RHDH_DB_STORAGE=${RHDH_DB_STORAGE:-1Gi}
-export RHDH_KEYCLOAK_REPLICAS=${RHDH_KEYCLOAK_REPLICAS:-5}
+export RHDH_KEYCLOAK_REPLICAS=${RHDH_KEYCLOAK_REPLICAS:-1}
 
 export API_COUNT=${API_COUNT:-1000}
 export COMPONENT_COUNT=${COMPONENT_COUNT:-1000}
diff --git a/ci-scripts/test.sh b/ci-scripts/test.sh
index 04912d8..e4843f6 100755
--- a/ci-scripts/test.sh
+++ b/ci-scripts/test.sh
@@ -13,11 +13,15 @@ source "$(readlink -m "$SCRIPT_DIR"/../test.env)"
 export SCENARIO RHDH_INSTALL_METHOD AUTH_PROVIDER
 
 RHDH_INSTALL_METHOD=${RHDH_INSTALL_METHOD:-helm}
-AUTH_PROVIDER=${AUTH_PROVIDER:-}
+AUTH_PROVIDER=${AUTH_PROVIDER:-keycloak}
 
 # testing env
 if [ "$RHDH_INSTALL_METHOD" == "olm" ]; then
-    rhdh_route="backstage-developer-hub"
+    if [ "$AUTH_PROVIDER" == "keycloak" ]; then
+        rhdh_route="rhdh"
+    else
+        rhdh_route="backstage-developer-hub"
+    fi
 elif [ "$RHDH_INSTALL_METHOD" == "helm" ]; then
     export RHDH_HELM_RELEASE_NAME RHDH_HELM_CHART
 
diff --git a/config/locust-k8s-operator.values.yaml b/config/locust-k8s-operator.values.yaml
index 6057749..7827c79 100644
--- a/config/locust-k8s-operator.values.yaml
+++ b/config/locust-k8s-operator.values.yaml
@@ -1,6 +1,7 @@
 image:
   repository: "quay.io/backstage-performance/locust-k8s-operator"
   tag: "latest"
+  pullPolicy: Always
 
 k8s:
   clusterRole:
@@ -17,3 +18,4 @@ config:
       ephemeralLimit: 100Mi
     metricsExporter:
       image: "quay.io/backstage-performance/locust_exporter:latest"
+      pullPolicy: Always
diff --git a/locust-test-template.yaml b/locust-test-template.yaml
index e54b0ee..1273338 100644
--- a/locust-test-template.yaml
+++ b/locust-test-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: ${SCENARIO}.test
 spec:
   image: quay.io/backstage-performance/locust:latest
-  imagePullPolicy: IfNotPresent
+  imagePullPolicy: Always
   masterCommandSeed: --locustfile /lotest/src/${SCENARIO}.py
     --host ${HOST}
     --users ${USERS}
@@ -12,5 +12,6 @@ spec:
     --run-time ${DURATION}
     ${LOCUST_EXTRA_CMD}
   workerCommandSeed: --locustfile /lotest/src/${SCENARIO}.py
+    ${LOCUST_EXTRA_CMD}
   workerReplicas: ${WORKERS}
   configMap: locust.${SCENARIO}
diff --git a/scenarios/mvp-1dot1.metrics.yaml b/scenarios/mvp-1dot1.metrics.yaml
new file mode 100644
index 0000000..497b3ff
--- /dev/null
+++ b/scenarios/mvp-1dot1.metrics.yaml
@@ -0,0 +1,40 @@
+# Results
+{%macro results_scenario(name) -%}
+- name: results.{{name}}.locust_requests_avg_response_time
+  monitoring_query: max(locust_requests_avg_response_time{name=~"{{name}}"})
+  monitoring_step: 15
+- name: results.{{name}}.locust_requests_avg_content_length
+  monitoring_query: max(locust_requests_avg_content_length{name=~"{{name}}"})
+  monitoring_step: 15
+- name: results.{{name}}.locust_requests_current_rps
+  monitoring_query: max(locust_requests_current_rps{name=~"{{name}}"})
+  monitoring_step: 15
+- name: results.{{name}}.locust_requests_current_fail_per_sec
+  monitoring_query: max(locust_requests_current_fail_per_sec{name=~"{{name}}"})
+  monitoring_step: 15
+- name: results.{{name}}.locust_requests_num_failures
+  monitoring_query: sum(locust_requests_num_failures{name=~"{{name}}"})
+  monitoring_step: 15
+- name: results.{{name}}.locust_errors
+  monitoring_query: sum(locust_errors{name=~"{{name}}"})
+  monitoring_step: 15
+{%- endmacro %}
+
+{{ results_scenario('/api/catalog/entities') }}
+{{ results_scenario('/api/catalog/entities\\\\?filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entities\\\\?filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entities\\\\?filter=kind%3Dcomponent%2Cspec\\\\.type%3Dlibrary') }}
+{{ results_scenario('/api/catalog/entity-facets') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=kind') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=relations\\\\.ownedBy') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.type&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.type&filter=kind%3Dcomponent') }}
diff --git a/scenarios/mvp-1dot1.py b/scenarios/mvp-1dot1.py
new file mode 100644
index 0000000..532ef5e
--- /dev/null
+++ b/scenarios/mvp-1dot1.py
@@ -0,0 +1,222 @@
+from locust import HttpUser, events, task
+from locust.runners import MasterRunner, WorkerRunner
+from urllib3.exceptions import InsecureRequestWarning
+import urllib.parse
+import json
+import re
+import urllib3
+
+urllib3.disable_warnings(InsecureRequestWarning)
+
+__version__ = "1"
+
+usernames = []
+
+entity_facets_params = {}
+
+entity_facets_params["kind"] = {
+    "facet": "kind",
+}
+
+entity_facets_params["relations.ownedBy"] = {
+    "facet": "relations.ownedBy",
+}
+
+entity_facets_params["metadata.namespace"] = {
+    "facet": "metadata.namespace",
+}
+
+entity_facets_params["spec.lifecycle"] = {
+    "facet": "spec.lifecycle",
+}
+
+entity_facets_params["metadata.tags"] = {
+    "facet": "metadata.tags",
+}
+
+entity_facets_params["component/spec.lifecycle"] = {
+    "facet": "spec.lifecycle",
+    "filter": "kind=component"
+}
+
+entity_facets_params["component/spec.type"] = {
+    "facet": "spec.type",
+    "filter": "kind=component"
+}
+
+entity_facets_params["component/metadata.namespace"] = {
+    "facet": "metadata.namespace",
+    "filter": "kind=component"
+}
+
+entity_facets_params["component/metadata.tags"] = {
+    "facet": "metadata.tags",
+    "filter": "kind=component"
+}
+
+entity_facets_params["api/spec.lifecycle"] = {
+    "facet": "spec.lifecycle",
+    "filter": "kind=api"
+}
+
+entity_facets_params["api/spec.type"] = {
+    "facet": "spec.type",
+    "filter": "kind=api"
+}
+
+entity_facets_params["api/metadata.namespace"] = {
+    "facet": "metadata.namespace",
+    "filter": "kind=api"
+}
+
+entity_facets_params["api/metadata.tags"] = {
+    "facet": "metadata.tags",
+    "filter": "kind=api"
+}
+
+entities_params = {}
+
+entities_params["component"] = {
+    "filter": "kind=component",
+}
+
+entities_params["component/library"] = {
+    "filter": "kind=component,spec.type=library",
+}
+
+entities_params["api"] = {
+    "filter": "kind=api",
+}
+
+
+base_path_facets = "/api/catalog/entity-facets"
+base_path_entities = "/api/catalog/entities"
+
+
+def setup_test_users(environment, msg, **kwargs):
+    # Fired when the worker receives a message of type 'test_users'
+    usernames.extend(map(lambda u: u, msg.data))
+
+
+@events.init.add_listener
+def on_locust_init(environment, **_kwargs):
+    if not isinstance(environment.runner, MasterRunner):
+        environment.runner.register_message("test_users", setup_test_users)
+
+
+@events.test_start.add_listener
+def on_test_start(environment, **_kwargs):
+    # When the test is started, evenly divides list between
+    # worker nodes to ensure unique data across threads
+    if not isinstance(environment.runner, WorkerRunner):
+        users = []
+        for i in range(1, int(environment.runner.target_user_count)+1):
+            users.append(f"test{i}")
+
+        worker_count = environment.runner.worker_count
+        chunk_size = int(len(users) / worker_count)
+
+        for i, worker in enumerate(environment.runner.clients):
+            start_index = i * chunk_size
+
+            if i + 1 < worker_count:
+                end_index = start_index + chunk_size
+            else:
+                end_index = len(users)
+
+            data = users[start_index:end_index]
+            environment.runner.send_message("test_users", data, worker)
+
+
+@events.init_command_line_parser.add_listener
+def _(parser):
+    parser.add_argument("--keycloak-host", type=str, default="")
+    parser.add_argument("--keycloak-password", is_secret=True, default="")
+
+
+class MVP1dot1Test(HttpUser):
+
+    def on_start(self):
+        self.client.verify = False
+        if self.environment.parsed_options.keycloak_host:
+            r = self.client.get('/api/auth/oauth2Proxy/refresh', verify=False)
+            qs_str = urllib.parse.parse_qs(r.url)
+            STATE = qs_str['state']
+            login_cookies = r.cookies
+            pattern = r'action="([^"]*)"'
+            LOGIN_URL_tmp = re.findall(pattern, str(r.content))[0]
+            LOGIN_URL = LOGIN_URL_tmp.replace("&amp;", "&")
+            qs_str = urllib.parse.parse_qs(LOGIN_URL)
+            TAB_ID = qs_str['tab_id']
+            EXECUTION = qs_str['execution']
+
+            param = {'client_id': self.CLIENTID,
+                     'tab_id': TAB_ID, 'execution': EXECUTION}
+            form = {'username': self.USERNAME,
+                    'password': self.PASSWORD, 'credentialId': ''}
+            r = self.client.post(LOGIN_URL, verify=False,
+                                 data=form, params=param)
+
+            r = self.client.get(self.REFRESH_URL, verify=False)
+            json_dict = json.loads(r.content)
+            TOKEN = json_dict['backstageIdentity']['token']
+
+            self.HEADER = {'Authorization': 'Bearer ' + TOKEN}
+        else:
+            r = self.client.get('/api/auth/guest/refresh', verify=False)
+            json_dict = json.loads(r.content)
+            TOKEN = json_dict['backstageIdentity']['token']
+
+            self.HEADER = {'Authorization': 'Bearer ' + TOKEN}
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.HEADER = ''
+        if self.environment.parsed_options.keycloak_host:
+            self.USERNAME = usernames.pop()
+            kc_host = self.environment.parsed_options.keycloak_host
+            self.KEYCLOAK_URL = f'https://{kc_host}/auth'
+            bs_host = self.environment.host
+            self.REDIRECT_URL = f'{bs_host}/oauth2/callback'
+            self.REFRESH_URL = f'{bs_host}/api/auth/oauth2Proxy/refresh'
+
+            self.PASSWORD = self.environment.parsed_options.keycloak_password
+            self.REALM = "backstage"
+            self.CLIENTID = "backstage"
+
+    def entitiy_facets(self, query) -> None:
+        self.client.get(base_path_facets,
+                        verify=False,
+                        headers=self.HEADER,
+                        params=entity_facets_params[query])
+
+    def entities(self, query) -> None:
+        self.client.get(base_path_entities,
+                        verify=False,
+                        headers=self.HEADER,
+                        params=entities_params[query])
+
+    @task
+    def get_kind(self) -> None:
+        self.entitiy_facets("kind")
+        self.entitiy_facets("relations.ownedBy")
+        self.entitiy_facets("metadata.namespace")
+        self.entitiy_facets("spec.lifecycle")
+        self.entitiy_facets("metadata.tags")
+        self.entities("component")
+        self.entitiy_facets("component/spec.lifecycle")
+        self.entitiy_facets("component/spec.type")
+        self.entitiy_facets("component/metadata.namespace")
+        self.entitiy_facets("component/metadata.tags")
+        self.entities("api")
+        self.entitiy_facets("api/spec.lifecycle")
+        self.entitiy_facets("api/spec.type")
+        self.entitiy_facets("api/metadata.namespace")
+        self.entitiy_facets("api/metadata.tags")
+        self.entities("component")
+        self.entitiy_facets("component/spec.lifecycle")
+        self.entitiy_facets("component/spec.type")
+        self.entitiy_facets("component/metadata.namespace")
+        self.entitiy_facets("component/metadata.tags")
+        self.entities("component/library")
+        self.entities("component")
diff --git a/scenarios/mvp.metrics.yaml b/scenarios/mvp.metrics.yaml
index 794fefa..7d9c9ad 100644
--- a/scenarios/mvp.metrics.yaml
+++ b/scenarios/mvp.metrics.yaml
@@ -1,40 +1,52 @@
 # Results
 {%macro results_scenario(name) -%}
 - name: results.{{name}}.locust_requests_avg_response_time
-  monitoring_query: locust_requests_avg_response_time{name="{{name}}"}
+  monitoring_query: max(locust_requests_avg_response_time{name=~"{{name}}"})
   monitoring_step: 15
 - name: results.{{name}}.locust_requests_avg_content_length
-  monitoring_query: locust_requests_avg_content_length{name="{{name}}"}
+  monitoring_query: max(locust_requests_avg_content_length{name=~"{{name}}"})
   monitoring_step: 15
 - name: results.{{name}}.locust_requests_current_rps
-  monitoring_query: locust_requests_current_rps{name="{{name}}"}
+  monitoring_query: max(locust_requests_current_rps{name=~"{{name}}"})
   monitoring_step: 15
 - name: results.{{name}}.locust_requests_current_fail_per_sec
-  monitoring_query: locust_requests_current_fail_per_sec{name="{{name}}"}
+  monitoring_query: max(locust_requests_current_fail_per_sec{name=~"{{name}}"})
   monitoring_step: 15
 - name: results.{{name}}.locust_requests_num_failures
-  monitoring_query: locust_requests_num_failures{name="{{name}}"}
+  monitoring_query: sum(locust_requests_num_failures{name=~"{{name}}"})
   monitoring_step: 15
 - name: results.{{name}}.locust_errors
-  monitoring_query: locust_errors{name="{{name}}"}
+  monitoring_query: sum(locust_errors{name=~"{{name}}"})
   monitoring_step: 15
 {%- endmacro %}
 
-{{ results_scenario('/api/catalog/entities') }}
-{{ results_scenario('/api/catalog/entities?filter=kind%3Dapi') }}
-{{ results_scenario('/api/catalog/entities?filter=kind%3Dcomponent') }}
-{{ results_scenario('/api/catalog/entities?filter=kind%3Dcomponent%2Cspec.type%3Dlibrary') }}
-{{ results_scenario('/api/catalog/entity-facets') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=kind') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.namespace') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.namespace&filter=kind%3Dapi') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.namespace&filter=kind%3Dcomponent') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.tags') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.tags&filter=kind%3Dapi') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=metadata.tags&filter=kind%3Dcomponent') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=relations.ownedBy') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=spec.lifecycle') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=spec.lifecycle&filter=kind%3Dapi') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=spec.lifecycle&filter=kind%3Dcomponent') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=spec.type&filter=kind%3Dapi') }}
-{{ results_scenario('/api/catalog/entity-facets?facet=spec.type&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/auth/oauth2Proxy/refresh') }}
+{{ results_scenario('/auth/realms/backstage/login-actions/authenticate\\\\?session_code=.*&.*&client_id=backstage&.*&execution=.*')}}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dapi%2Crelations\\\\.ownedBy%3D.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Duser%3A.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Duser%3A.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+%2Cspec_type%3Dlibrary') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=0&filter=kind%3Dcomponent%2Cspec_type%3Dlibrary') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&cursor=.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&filter=kind%3Dapi%2Crelations\\\\.ownedBy%3Duser%3A.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Duser%3A.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+') }}
+{{ results_scenario('/api/catalog/entities/by-query\\\\?limit=20&orderField=metadata\\\\.name%2Casc&filter=kind%3Dcomponent%2Crelations\\\\.ownedBy%3Duser%3A.+%2Crelations\\\\.ownedBy%3Dgroup%3A.+%2Cspec_type%3Dlibrary') }}
+{{ results_scenario('/api/catalog/entities/by-refs') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=kind') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.namespace&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=metadata\\\\.tags&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=relations\\\\.ownedBy') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.lifecycle&filter=kind%3Dcomponent') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.type&filter=kind%3Dapi') }}
+{{ results_scenario('/api/catalog/entity-facets\\\\?facet=spec\\\\.type&filter=kind%3Dcomponent') }}
+#... to be continued
\ No newline at end of file
diff --git a/scenarios/mvp.py b/scenarios/mvp.py
index b7444c2..95b525e 100644
--- a/scenarios/mvp.py
+++ b/scenarios/mvp.py
@@ -74,42 +74,51 @@
     "filter": "kind=api"
 }
 
-entities_params = {}
 
-entities_params["component"] = {
-    "filter": "kind=component",
-}
-
-entities_params["component/library"] = {
-    "filter": "kind=component,spec.type=library",
-}
-
-entities_params["api"] = {
-    "filter": "kind=api",
-}
+def get_entities_by_query_params(kind=None, limit=0, user_ref=None, group_ref=None, additional_filter={}, additional_params={}):
+    params = {}
+    params["limit"] = limit
+    if limit > 0:
+        params["orderField"] = "metadata.name,asc"
+    filter = ""
+    if kind is not None:
+        filter = f"kind={kind}"
+    if user_ref is not None:
+        filter += f",relations.ownedBy={user_ref}"
+    if group_ref is not None:
+        filter += f",relations.ownedBy={group_ref}"
+    if len(additional_filter) > 0:
+        for k, v in additional_filter.items():
+            filter += f",{k}={v}"
+    if len(filter) > 0:
+        params["filter"] = filter
+
+    params.update(additional_params)
+    return params
 
 
 base_path_facets = "/api/catalog/entity-facets"
 base_path_entities = "/api/catalog/entities"
 
 
-
 def setup_test_users(environment, msg, **kwargs):
     # Fired when the worker receives a message of type 'test_users'
     usernames.extend(map(lambda u: u, msg.data))
 
+
 @events.init.add_listener
 def on_locust_init(environment, **_kwargs):
     if not isinstance(environment.runner, MasterRunner):
         environment.runner.register_message("test_users", setup_test_users)
 
+
 @events.test_start.add_listener
 def on_test_start(environment, **_kwargs):
     # When the test is started, evenly divides list between
     # worker nodes to ensure unique data across threads
     if not isinstance(environment.runner, WorkerRunner):
         users = []
-        for i in range(1,int(environment.runner.target_user_count)+1):
+        for i in range(1, int(environment.runner.target_user_count)+1):
             users.append(f"test{i}")
 
         worker_count = environment.runner.worker_count
@@ -126,57 +135,81 @@ def on_test_start(environment, **_kwargs):
             data = users[start_index:end_index]
             environment.runner.send_message("test_users", data, worker)
 
+
 @events.init_command_line_parser.add_listener
 def _(parser):
     parser.add_argument("--keycloak-host", type=str, default="")
     parser.add_argument("--keycloak-password", is_secret=True, default="")
+    parser.add_argument("--debug", type=bool, default=False)
 
 
-
-class MVPTest(HttpUser):
+class MVP1dot2Test(HttpUser):
 
     def on_start(self):
         self.client.verify = False
         if self.environment.parsed_options.keycloak_host:
             r = self.client.get('/api/auth/oauth2Proxy/refresh', verify=False)
-            qs_str=urllib.parse.parse_qs(r.url)
-            STATE=qs_str['state']
-            login_cookies=r.cookies
+            qs_str = urllib.parse.parse_qs(r.url)
+            STATE = qs_str['state']
+            login_cookies = r.cookies
             pattern = r'action="([^"]*)"'
-            LOGIN_URL_tmp=re.findall(pattern, str(r.content))[0]
-            LOGIN_URL=LOGIN_URL_tmp.replace("&amp;", "&")
-            qs_str=urllib.parse.parse_qs(LOGIN_URL)
-            TAB_ID=qs_str['tab_id']
-            EXECUTION=qs_str['execution']
-
-            param = {'client_id': self.CLIENTID, 'tab_id': TAB_ID, 'execution': EXECUTION}
-            form = {'username': self.USERNAME, 'password': self.PASSWORD, 'credentialId': ''}
-            r = self.client.post(LOGIN_URL, verify=False, data=form, params=param)
+            LOGIN_URL_tmp = re.findall(pattern, str(r.content))[0]
+            LOGIN_URL = LOGIN_URL_tmp.replace("&amp;", "&")
+            qs_str = urllib.parse.parse_qs(LOGIN_URL)
+            TAB_ID = qs_str['tab_id']
+            EXECUTION = qs_str['execution']
+
+            param = {'client_id': self.CLIENTID,
+                     'tab_id': TAB_ID, 'execution': EXECUTION}
+            form = {'username': self.USERNAME,
+                    'password': self.PASSWORD, 'credentialId': ''}
+            r = self.client.post(LOGIN_URL, verify=False,
+                                 data=form, params=param)
 
             r = self.client.get(self.REFRESH_URL, verify=False)
             json_dict = json.loads(r.content)
-            TOKEN=json_dict['backstageIdentity']['token']
+            TOKEN = json_dict['backstageIdentity']['token']
+            idetity_refs = json_dict['backstageIdentity']['identity']['ownershipEntityRefs']
+            for id_ref in idetity_refs:
+                if str(id_ref).startswith("group"):
+                    self.GROUP_REF = id_ref
+                    continue
+                if str(id_ref).startswith("user"):
+                    self.USER_REF = id_ref
 
             self.HEADER = {'Authorization': 'Bearer ' + TOKEN}
-        else :
+        else:
             r = self.client.get('/api/auth/guest/refresh', verify=False)
             json_dict = json.loads(r.content)
-            TOKEN=json_dict['backstageIdentity']['token']
+            TOKEN = json_dict['backstageIdentity']['token']
+
+            idetity_refs = json_dict['backstageIdentity']['identity']['ownershipEntityRefs']
+            for id_ref in idetity_refs:
+                if str(id_ref).startswith("user"):
+                    self.USER_REF = id_ref
+                    if "guest" in str(id_ref):
+                        self.GROUP_REF = None
+                        break
+                    continue
+                if str(id_ref).startswith("group"):
+                    self.GROUP_REF = id_ref
 
             self.HEADER = {'Authorization': 'Bearer ' + TOKEN}
 
     def __init__(self, parent):
         super().__init__(parent)
-        self.HEADER=''
+        self.HEADER = ''
         if self.environment.parsed_options.keycloak_host:
             self.USERNAME = usernames.pop()
-            self.KEYCLOAK_URL=f'https://{self.environment.parsed_options.keycloak_host}/auth'
-            self.REDIRECT_URL=f'{self.environment.host}/oauth2/callback'
-            self.REFRESH_URL=f'{self.environment.host}/api/auth/oauth2Proxy/refresh'
+            kc_host = self.environment.parsed_options.keycloak_host
+            self.KEYCLOAK_URL = f'https://{kc_host}/auth'
+            bs_host = self.environment.host
+            self.REDIRECT_URL = f'{bs_host}/oauth2/callback'
+            self.REFRESH_URL = f'{bs_host}/api/auth/oauth2Proxy/refresh'
 
-            self.PASSWORD=self.environment.parsed_options.keycloak_password
-            self.REALM="backstage"
-            self.CLIENTID="backstage"
+            self.PASSWORD = self.environment.parsed_options.keycloak_password
+            self.REALM = "backstage"
+            self.CLIENTID = "backstage"
 
     def entitiy_facets(self, query) -> None:
         self.client.get(base_path_facets,
@@ -184,33 +217,123 @@ def entitiy_facets(self, query) -> None:
                         headers=self.HEADER,
                         params=entity_facets_params[query])
 
-    def entities(self, query) -> None:
-        self.client.get(base_path_entities,
-                        verify=False,
-                        headers=self.HEADER,
-                        params=entities_params[query])
+    def entities_by_query(self, kind=None, limit=0, user_ref=None, group_ref=None, additional_filter={}, additional_params={}):
+        r = self.client.get(f"{base_path_entities}/by-query",
+                            verify=False,
+                            headers=self.HEADER,
+                            params=get_entities_by_query_params(kind, limit, user_ref, group_ref, additional_filter, additional_params))
+        if self.environment.parsed_options.debug:
+            size = sum(len(chunk) for chunk in r.iter_content(8196))
+            debug_output = f"\n[DEBUG][entities_by_query]"
+            debug_output += f" kind={kind}"
+            debug_output += f", limit={limit}"
+            debug_output += f", user_ref={user_ref}"
+            debug_output += f", group_ref={group_ref}"
+            debug_output += f", additional_filter={additional_filter}"
+            debug_output += f", additional_params={additional_params}"
+            debug_output += f", response_size={size}"
+            debug_output += f", response={r.content}\n"
+            print(debug_output)
+        return r
+
+    def entities_by_refs(self, refs=[]):
+        entity_refs = {"entityRefs": refs}
+        r = self.client.post(f"{base_path_entities}/by-refs",
+                             verify=False,
+                             headers=self.HEADER,
+                             json=entity_refs)
+        if self.environment.parsed_options.debug:
+            size = sum(len(chunk) for chunk in r.iter_content(8196))
+            debug_output = f"\n[DEBUG][entities_by_refs]"
+            debug_output += f", refs={refs}"
+            debug_output += f", response_size={size}"
+            debug_output += f", response={r.content}\n"
+            print(debug_output)
 
     @task
-    def get_kind(self) -> None:
-        self.entitiy_facets("kind")
+    def execute(self) -> None:
+        # Load Catalog
+        group_ref = self.GROUP_REF
+        if "guest" in self.USER_REF:
+            group_ref = "group:default/group1"
         self.entitiy_facets("relations.ownedBy")
-        self.entitiy_facets("metadata.namespace")
+        self.entitiy_facets("kind")
         self.entitiy_facets("spec.lifecycle")
         self.entitiy_facets("metadata.tags")
-        self.entities("component")
-        self.entitiy_facets("component/spec.lifecycle")
+        self.entitiy_facets("metadata.namespace")
+        self.entities_by_query(kind="component", limit=20)
+        self.entities_by_query(kind="component", limit=20)
         self.entitiy_facets("component/spec.type")
-        self.entitiy_facets("component/metadata.namespace")
+        self.entities_by_query(
+            kind="component", limit=0,
+            user_ref=self.USER_REF, group_ref=group_ref)
+        self.entities_by_query(kind="component", limit=0)
+        self.entitiy_facets("component/spec.lifecycle")
         self.entitiy_facets("component/metadata.tags")
-        self.entities("api")
-        self.entitiy_facets("api/spec.lifecycle")
+        self.entitiy_facets("component/metadata.namespace")
+        self.entities_by_refs([group_ref])
+        self.entities_by_query(
+            kind="component", limit=20,
+            user_ref=self.USER_REF, group_ref=group_ref)
+
+        # Switch to API
+        self.entities_by_query(
+            kind="api", limit=20,
+            user_ref=self.USER_REF, group_ref=group_ref)
         self.entitiy_facets("api/spec.type")
-        self.entitiy_facets("api/metadata.namespace")
+        self.entities_by_query(
+            kind="api", limit=0,
+            user_ref=self.USER_REF, group_ref=group_ref)
+        self.entities_by_query(kind="api", limit=0)
+        self.entitiy_facets("api/spec.lifecycle")
         self.entitiy_facets("api/metadata.tags")
-        self.entities("component")
+        self.entitiy_facets("api/metadata.namespace")
+
+        # Switch to Component
+        self.entities_by_query(
+            kind="component", limit=20,
+            user_ref=self.USER_REF, group_ref=group_ref)
+        self.entitiy_facets("component/spec.lifecycle")
+        self.entities_by_query(
+            kind="component", limit=0,
+            user_ref=self.USER_REF, group_ref=group_ref)
+        self.entities_by_query(kind="component", limit=0)
         self.entitiy_facets("component/spec.lifecycle")
-        self.entitiy_facets("component/spec.type")
-        self.entitiy_facets("component/metadata.namespace")
         self.entitiy_facets("component/metadata.tags")
-        self.entities("component/library")
-        self.entities("component")
+        self.entitiy_facets("component/metadata.namespace")
+        self.entities_by_refs([group_ref])
+
+        # Select "library"
+        self.entities_by_query(
+            kind="component", limit=20,
+            user_ref=self.USER_REF, group_ref=group_ref,
+            additional_filter={"spec_type": "library"})
+        self.entities_by_query(
+            kind="component", limit=0,
+            user_ref=self.USER_REF, group_ref=group_ref,
+            additional_filter={"spec_type": "library"})
+        self.entities_by_query(
+            kind="component", limit=0,
+            additional_filter={"spec_type": "library"})
+        self.entities_by_query(kind="component", limit=20)
+        self.entities_by_refs([group_ref])
+
+        # Select "all"
+        self.entities_by_query(
+            kind="component", limit=20,
+            group_ref=group_ref)
+        self.entities_by_query(
+            kind="component", limit=0,
+            group_ref=group_ref)
+        self.entities_by_refs([group_ref])
+
+        # Select/Load next page
+        r = self.entities_by_query(
+            kind="component", limit=20,
+            group_ref=group_ref)
+        json_dict = json.loads(r.content)
+        page_info = json_dict["pageInfo"]
+        if len(page_info) > 0:
+            self.entities_by_query(
+                limit=20,
+                additional_params={"cursor": page_info["nextCursor"]})
diff --git a/test.env b/test.env
index f65730e..13fff96 100644
--- a/test.env
+++ b/test.env
@@ -18,7 +18,7 @@
 # export API_COUNT=1
 # export COMPONENT_COUNT=1
 # export KEYCLOAK_USER_PASS=changeme
-# export AUTH_PROVIDER=
+# export AUTH_PROVIDER=keycloak
 # export POPULATION_CONCURRENCY=10
 # export COMPONENT_SHARD_SIZE=500
 
@@ -38,8 +38,8 @@
 # export RHDH_INSTALL_METHOD=olm
 # export RHDH_NAMESPACE=rhdh-performance-olm
 # export RHDH_OPERATOR_NAMESPACE=rhdh-operator
-# export RHDH_OLM_INDEX_IMAGE=quay.io/rhdh/iib:1.2-v4.15-x86_64
-# export RHDH_OLM_CHANNEL=fast
+# export RHDH_OLM_INDEX_IMAGE=registry.redhat.io/redhat/redhat-operator-index:v4.15
+# export RHDH_OLM_CHANNEL=fast-1.2
 
 ## RHDH horizontal scaling
 # export RHDH_DEPLOYMENT_REPLICAS=1
@@ -52,7 +52,7 @@
 # export RHDH_KEYCLOAK_REPLICAS=1
 
 ## Extras
-# export LOCUST_EXTRA_CMD=
+# export LOCUST_EXTRA_CMD=--debug=true
 # export ARTIFACT_DIR=.artifacts
 # export ENABLE_RBAC=false
 # export ENABLE_PROFILING=false