diff --git a/scripts/test-run.sh b/scripts/test-run.sh
index a12a4f394..7826f4ec1 100755
--- a/scripts/test-run.sh
+++ b/scripts/test-run.sh
@@ -96,23 +96,23 @@ metadata:
   if [[ "${TAG}" != "default" ]]
   then
     TAG_MESSAGE="with controller tag ${TAG} "
-    ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.image.tag=${TAG} ");
+    ADDITIONAL_FLAGS+=("--set ingressController.deployment.pod.container.image.tag=${TAG} ");
   fi
 
   # Configure values for all tests
   # Enable Gateway API
-  ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.env.feature_gates=GatewayAlpha=true")
+  ADDITIONAL_FLAGS+=("--set ingressController.deployment.pod.container.env.feature_gates=GatewayAlpha=true")
   # Tests should not show up in reporting
-  ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.env.anonymous_reports=false")
+  ADDITIONAL_FLAGS+=("--set ingressController.deployment.pod.container.env.anonymous_reports=false")
 
   if [[ -n "${KONG_VERSION-}" ]]
   then
-  ADDITIONAL_FLAGS+=("--set ${GATEWAY_PREFIX}image.tag=${KONG_VERSION}")
+  ADDITIONAL_FLAGS+=("--set image.tag=${KONG_VERSION}")
   fi
 
   if [[ -n "${KIC_VERSION-}" ]]
   then
-  ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.image.tag=${KIC_VERSION}")
+  ADDITIONAL_FLAGS+=("--set ingressController.deployment.pod.container.image.tag=${KIC_VERSION}")
   fi
 
   echo "INFO: installing chart as release ${RELEASE_NAME} ${TAG_MESSAGE}to namespace ${RELEASE_NAMESPACE}"
diff --git a/scripts/test-upgrade.sh b/scripts/test-upgrade.sh
index 5d6b28715..4f63f296c 100755
--- a/scripts/test-upgrade.sh
+++ b/scripts/test-upgrade.sh
@@ -46,7 +46,7 @@ else
   set -x
   # shellcheck disable=SC2048,SC2086
   helm install --create-namespace --namespace "${RELEASE_NAMESPACE}" "${RELEASE_NAME}" \
-      --set ${CONTROLLER_PREFIX}ingressController.env.anonymous_reports="false" \
+      --set ingressController.deployment.pod.container.env.anonymous_reports="false" \
       --set deployment.test.enabled=true ${ADDITIONAL_FLAGS[*]} \
       "charts/${CHART_NAME}"
   set +x
@@ -84,10 +84,10 @@ else
   set -x
   # shellcheck disable=SC2048,SC2086
   helm upgrade --namespace "${RELEASE_NAMESPACE}" "${RELEASE_NAME}" \
-      --set ${CONTROLLER_PREFIX}ingressController.image.tag="${TAG}" \
+      --set ingressController.deployment.pod.container.image.tag="${TAG}" \
       --set deployment.test.enabled=true ${ADDITIONAL_FLAGS[*]} \
-      --set ${CONTROLLER_PREFIX}ingressController.env.anonymous_reports="false" \
-      --set ${CONTROLLER_PREFIX}ingressController.image.effectiveSemver="${EFFECTIVE_TAG}" \
+      --set ingressController.deployment.pod.container.env.anonymous_reports="false" \
+      --set ingressController.deployment.pod.container.image.effectiveSemver="${EFFECTIVE_TAG}" \
       "charts/${CHART_NAME}"
   set +x
 fi