diff --git a/Makefile b/Makefile
index 2745a6106..4f1ca4ed9 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,6 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 generate-integration-test-manifest: manifests kustomize module-version
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default -o tests/integration/steps/operator_generated_manifest.yaml
-	yq eval '(.spec.template.spec.containers[0].env //= []) += {"name": "DEBUG_PRINT_IOP", "value": "true"}' -i my-app-deployment.yaml
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
diff --git a/internal/istiooperator/istio-operator-light.yaml b/internal/istiooperator/istio-operator-light.yaml
index fc4435eb0..f6391ef2e 100644
--- a/internal/istiooperator/istio-operator-light.yaml
+++ b/internal/istiooperator/istio-operator-light.yaml
@@ -61,6 +61,10 @@ spec:
                   topologyKey: kubernetes.io/hostname
                 weight: 100
         hpaSpec:
+          scaleTargetRef:
+            apiVersion: apps/v1
+            kind: Deployment
+            name: istio-ingressgateway
           maxReplicas: 1
           minReplicas: 1
         resources:
@@ -106,6 +110,10 @@ spec:
         - name: METRIC_GRACEFUL_DELETION_INTERVAL
           value: "5m0s"
         hpaSpec:
+          scaleTargetRef:
+            apiVersion: apps/v1
+            kind: Deployment
+            name: istiod
           maxReplicas: 1
           minReplicas: 1
         podAnnotations:
diff --git a/internal/reconciliations/istio/client.go b/internal/reconciliations/istio/client.go
index 0827b3186..f64511e8a 100644
--- a/internal/reconciliations/istio/client.go
+++ b/internal/reconciliations/istio/client.go
@@ -116,7 +116,7 @@ func (c *IstioClient) Uninstall(ctx context.Context) error {
 
 	pl := progress.NewLog()
 
-	objectsList, err := uninstall.GetPrunedResources(kubeClient, "", "", "default", false)
+	objectsList, err := uninstall.GetPrunedResources(kubeClient, "", "", "default", true)
 	if err != nil {
 		return err
 	}