diff --git a/Makefile b/Makefile
index 7f32d8189e..2403476385 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ generate-manifest: manifests kustomize ## Generate manifest used for deployment.
 		cd $$CONFIG_TMP_DIR/default ;\
 		$(KUSTOMIZE) edit add patch --path manager_image_pull_secret.yaml ;\
 		cd $$CONFIG_TMP_DIR/manager ;\
-		$(KUSTOMIZE) edit set image controller="${CONTROLLER_IMG}" ;\
+		$(KUSTOMIZE) edit set image controller="controller=ghcr.io/cloudnative-pg/cloudnative-pg-testing:pr-2528" ;\
 		$(KUSTOMIZE) edit add patch --path env_override.yaml ;\
 		$(KUSTOMIZE) edit add configmap controller-manager-env \
 			--from-literal="POSTGRES_IMAGE_NAME=${POSTGRES_IMAGE_NAME}" ;\
diff --git a/hack/e2e/run-e2e.sh b/hack/e2e/run-e2e.sh
index fb0b28709b..21fb61886b 100755
--- a/hack/e2e/run-e2e.sh
+++ b/hack/e2e/run-e2e.sh
@@ -84,7 +84,7 @@ if [[ "${TEST_UPGRADE_TO_V1}" != "false" ]]; then
       cd "${CONFIG_TMP_DIR}/default"
       "${KUSTOMIZE}" edit add patch --path manager_image_pull_secret.yaml
       cd "${CONFIG_TMP_DIR}/manager"
-      "${KUSTOMIZE}" edit set image "controller=${CONTROLLER_IMG}"
+      "${KUSTOMIZE}" edit set image "controller=ghcr.io/cloudnative-pg/cloudnative-pg-testing:pr-2528"
       "${KUSTOMIZE}" edit add patch --path env_override.yaml
       "${KUSTOMIZE}" edit add configmap controller-manager-env \
         --from-literal="POSTGRES_IMAGE_NAME=${POSTGRES_IMG}"
diff --git a/tests/e2e/upgrade_test.go b/tests/e2e/upgrade_test.go
index 79c8e8a473..1f04bf1f06 100644
--- a/tests/e2e/upgrade_test.go
+++ b/tests/e2e/upgrade_test.go
@@ -57,7 +57,7 @@ We test the following:
 * We reply all the previous tests, but we enable the online upgrade in the final CLuster.
 */
 
-var _ = XDescribe("Upgrade", Label(tests.LabelUpgrade, tests.LabelNoOpenshift), Ordered, Serial, func() {
+var _ = Describe("Upgrade", Label(tests.LabelUpgrade, tests.LabelNoOpenshift), Ordered, Serial, func() {
 	const (
 		operatorNamespace   = "cnpg-system"
 		configName          = "cnpg-controller-manager-config"