diff --git a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
index 333b264dfe38..c85f034e1a11 100644
--- a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
+++ b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
@@ -293,6 +293,7 @@ public void cleanup() {
       for (final UUID destinationId : destinationIds) {
         deleteDestination(destinationId);
       }
+      destinationPsql.stop();
     } catch (final Exception e) {
       LOGGER.error("Error tearing down test fixtures:", e);
     }
diff --git a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
index 35c0db1de9c5..87a9f67a0e09 100644
--- a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
+++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
@@ -199,7 +199,9 @@ void testCheckpointing() throws Exception {
     // now cancel it so that we freeze state!
     try {
       apiClient.getJobsApi().cancelJob(new JobIdRequestBody().id(connectionSyncRead1.getJob().getId()));
-    } catch (final Exception e) {}
+    } catch (final Exception e) {
+      LOGGER.error("error:", e);
+    }
 
     final ConnectionState connectionState = waitForConnectionState(apiClient, connectionId);
 
diff --git a/kube/overlays/dev-integration-test/.env b/kube/overlays/dev-integration-test/.env
index 64612ea1aa4d..ada7a851bf34 100644
--- a/kube/overlays/dev-integration-test/.env
+++ b/kube/overlays/dev-integration-test/.env
@@ -54,6 +54,11 @@ JOB_MAIN_CONTAINER_CPU_LIMIT=
 JOB_MAIN_CONTAINER_MEMORY_REQUEST=
 JOB_MAIN_CONTAINER_MEMORY_LIMIT=
 
+NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_LIMIT=
+NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_REQUEST=
+NORMALIZATION_JOB_MAIN_CONTAINER_CPU_LIMIT=
+NORMALIZATION_JOB_MAIN_CONTAINER_CPU_REQUEST=
+
 # Worker pod tolerations, annotations and node selectors
 JOB_KUBE_TOLERATIONS=
 JOB_KUBE_ANNOTATIONS=
@@ -64,6 +69,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
 
 # Launch a separate pod to orchestrate sync steps
 CONTAINER_ORCHESTRATOR_ENABLED=true
+CONTAINER_ORCHESTRATOR_IMAGE=
 
 # Open Telemetry Configuration
 METRIC_CLIENT=
diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env
index e1b01c39f270..a410638647ba 100644
--- a/kube/overlays/stable/.env
+++ b/kube/overlays/stable/.env
@@ -71,6 +71,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
 
 # Launch a separate pod to orchestrate sync steps
 CONTAINER_ORCHESTRATOR_ENABLED=true
+CONTAINER_ORCHESTRATOR_IMAGE=
 
 # Open Telemetry Configuration
 METRIC_CLIENT=