diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index 52566b916ec..312a10dc2a8 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -33,15 +33,8 @@ schedules:
   always: true
 
 parameters:
-  - name: buildCni
-    type: boolean
-    default: true
-  - name: buildCns
-    type: boolean
-    default: true
-  - name: buildIpam
-    type: boolean
-    default: true
+  # Empty or __use-default__ builds and publishes the component image.
+  # A supplied image skips those entries and is used by the install path.
   - name: cniImage
     type: string
     default: "__use-default__"
@@ -51,6 +44,15 @@ parameters:
   - name: ipamImage
     type: string
     default: "__use-default__"
+  - name: azureIptablesMonitorImage
+    type: string
+    default: "__use-default__"
+  - name: azureIpMasqMergerImage
+    type: string
+    default: "__use-default__"
+  - name: ciliumLogCollectorImage
+    type: string
+    default: "__use-default__"
   # Optional build-number prefix to differentiate DALEC release runs.
   # Applied in setup only when the value contains "dalec".
   - name: runNamePrefix
@@ -87,33 +89,34 @@ stages:
               echo "##vso[task.setvariable variable=imageRepositoryPath;isOutput=true]acnpublic.azurecr.io"
               echo "##vso[task.setvariable variable=cnsImagePrefix;isOutput=true]azure-"
 
-              # Shared parser for cniImage/cnsImage/ipamImage override inputs.
+              # Shared parser for component image override inputs.
               . ./hack/scripts/parse_override_image.sh
 
-              read -r USE_CNI CNI_REPO CNI_NAME CNI_VERSION <<< "$(parse_override_image '${{ parameters.cniImage }}' azure-cni $(make cni-version))"
-              read -r USE_CNS CNS_REPO CNS_NAME CNS_VERSION <<< "$(parse_override_image '${{ parameters.cnsImage }}' azure-cns $(make cns-version))"
-              read -r USE_IPAM IPAM_REPO IPAM_NAME IPAM_VERSION <<< "$(parse_override_image '${{ parameters.ipamImage }}' azure-ipam $(make azure-ipam-version))"
+              read -r CNI_REPO CNI_NAME CNI_VERSION <<< "$(parse_override_image '${{ parameters.cniImage }}' azure-cni $(make cni-version))"
+              read -r CNS_REPO CNS_NAME CNS_VERSION <<< "$(parse_override_image '${{ parameters.cnsImage }}' azure-cns $(make cns-version))"
+              read -r IPAM_REPO IPAM_NAME IPAM_VERSION <<< "$(parse_override_image '${{ parameters.ipamImage }}' azure-ipam $(make azure-ipam-version))"
 
-              echo "##vso[task.setvariable variable=useProvidedCniImage;isOutput=true]${USE_CNI}"
               echo "##vso[task.setvariable variable=cniImageRepo;isOutput=true]${CNI_REPO}"
               echo "##vso[task.setvariable variable=cniImageNameOverride;isOutput=true]${CNI_NAME}"
               echo "##vso[task.setvariable variable=cniVersion;isOutput=true]${CNI_VERSION}"
 
               # Example (CNS):
-              # cnsImage="__use-default__" -> useProvidedCnsImage=false, cnsImageRepo=ACN,
-              # cnsImageNameOverride=azure-cns, cnsVersion=<make cns-version>
+              # cnsImage="__use-default__" -> cnsImageRepo=ACN, cnsImageNameOverride=azure-cns,
+              # cnsVersion=<make cns-version>
               # cnsImage="mcr.microsoft.com/containernetworking/azure-cns:v1.2.3" ->
-              # useProvidedCnsImage=true, cnsImageRepo=MCR, cnsImageNameOverride=azure-cns, cnsVersion=v1.2.3
-              echo "##vso[task.setvariable variable=useProvidedCnsImage;isOutput=true]${USE_CNS}"
+              # cnsImageRepo=MCR, cnsImageNameOverride=azure-cns, cnsVersion=v1.2.3
               echo "##vso[task.setvariable variable=cnsImageRepo;isOutput=true]${CNS_REPO}"
               echo "##vso[task.setvariable variable=cnsImageNameOverride;isOutput=true]${CNS_NAME}"
               echo "##vso[task.setvariable variable=cnsVersion;isOutput=true]${CNS_VERSION}"
 
-              echo "##vso[task.setvariable variable=useProvidedIpamImage;isOutput=true]${USE_IPAM}"
               echo "##vso[task.setvariable variable=ipamImageRepo;isOutput=true]${IPAM_REPO}"
               echo "##vso[task.setvariable variable=ipamImageNameOverride;isOutput=true]${IPAM_NAME}"
               echo "##vso[task.setvariable variable=ipamVersion;isOutput=true]${IPAM_VERSION}"
 
+              echo "##vso[task.setvariable variable=azureIptablesMonitorImageOverride;isOutput=true]$(resolve_override_image '${{ parameters.azureIptablesMonitorImage }}' azure-iptables-monitor $(make azure-iptables-monitor-version))"
+              echo "##vso[task.setvariable variable=azureIpMasqMergerImageOverride;isOutput=true]$(resolve_override_image '${{ parameters.azureIpMasqMergerImage }}' azure-ip-masq-merger $(make azure-ip-masq-merger-version))"
+              echo "##vso[task.setvariable variable=ciliumLogCollectorImageOverride;isOutput=true]$(resolve_override_image '${{ parameters.ciliumLogCollectorImage }}' cilium-log-collector $(make cilium-log-collector-version))"
+
               cat /etc/os-release
               uname -a
               sudo chown -R $(whoami):$(whoami) .
@@ -186,7 +189,7 @@ stages:
             name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
           strategy:
             matrix:
-              ${{ if eq(parameters.buildIpam, true) }}:
+              ${{ if or(eq(parameters.ipamImage, '__use-default__'), eq(parameters.ipamImage, '')) }}:
                 azure_ipam_linux_amd64:
                   arch: amd64
                   name: azure-ipam
@@ -195,15 +198,17 @@ stages:
                   arch: amd64
                   name: azure-ipam
                   os: windows
-              azure_ip_masq_merger_linux_amd64:
-                arch: amd64
-                name: azure-ip-masq-merger
-                os: linux
-              azure_iptables_monitor_linux_amd64:
-                arch: amd64
-                name: azure-iptables-monitor
-                os: linux
-              ${{ if eq(parameters.buildCni, true) }}:
+              ${{ if or(eq(parameters.azureIpMasqMergerImage, '__use-default__'), eq(parameters.azureIpMasqMergerImage, '')) }}:
+                azure_ip_masq_merger_linux_amd64:
+                  arch: amd64
+                  name: azure-ip-masq-merger
+                  os: linux
+              ${{ if or(eq(parameters.azureIptablesMonitorImage, '__use-default__'), eq(parameters.azureIptablesMonitorImage, '')) }}:
+                azure_iptables_monitor_linux_amd64:
+                  arch: amd64
+                  name: azure-iptables-monitor
+                  os: linux
+              ${{ if or(eq(parameters.cniImage, '__use-default__'), eq(parameters.cniImage, '')) }}:
                 cni_linux_amd64:
                   arch: amd64
                   name: cni
@@ -212,7 +217,7 @@ stages:
                   arch: amd64
                   name: cni
                   os: windows
-              ${{ if eq(parameters.buildCns, true) }}:
+              ${{ if or(eq(parameters.cnsImage, '__use-default__'), eq(parameters.cnsImage, '')) }}:
                 cns_linux_amd64:
                   arch: amd64
                   name: cns
@@ -225,10 +230,11 @@ stages:
                 arch: amd64
                 name: ipv6-hp-bpf
                 os: linux
-              cilium_log_collector_amd64:
-                arch: amd64
-                name: cilium-log-collector
-                os: linux
+              ${{ if or(eq(parameters.ciliumLogCollectorImage, '__use-default__'), eq(parameters.ciliumLogCollectorImage, '')) }}:
+                cilium_log_collector_amd64:
+                  arch: amd64
+                  name: cilium-log-collector
+                  os: linux
           steps:
             - template: containers/container-template.yaml
               parameters:
@@ -243,25 +249,27 @@ stages:
           strategy:
             maxParallel: 2
             matrix:
-              ${{ if eq(parameters.buildIpam, true) }}:
+              ${{ if or(eq(parameters.ipamImage, '__use-default__'), eq(parameters.ipamImage, '')) }}:
                 azure_ipam_linux_arm64:
                   arch: arm64
                   name: azure-ipam
                   os: linux
-              azure_ip_masq_merger_linux_arm64:
-                arch: arm64
-                name: azure-ip-masq-merger
-                os: linux
-              azure_iptables_monitor_linux_arm64:
-                arch: arm64
-                name: azure-iptables-monitor
-                os: linux
-              ${{ if eq(parameters.buildCni, true) }}:
+              ${{ if or(eq(parameters.azureIpMasqMergerImage, '__use-default__'), eq(parameters.azureIpMasqMergerImage, '')) }}:
+                azure_ip_masq_merger_linux_arm64:
+                  arch: arm64
+                  name: azure-ip-masq-merger
+                  os: linux
+              ${{ if or(eq(parameters.azureIptablesMonitorImage, '__use-default__'), eq(parameters.azureIptablesMonitorImage, '')) }}:
+                azure_iptables_monitor_linux_arm64:
+                  arch: arm64
+                  name: azure-iptables-monitor
+                  os: linux
+              ${{ if or(eq(parameters.cniImage, '__use-default__'), eq(parameters.cniImage, '')) }}:
                 cni_linux_arm64:
                   arch: arm64
                   name: cni
                   os: linux
-              ${{ if eq(parameters.buildCns, true) }}:
+              ${{ if or(eq(parameters.cnsImage, '__use-default__'), eq(parameters.cnsImage, '')) }}:
                 cns_linux_arm64:
                   arch: arm64
                   name: cns
@@ -270,10 +278,11 @@ stages:
                 arch: arm64
                 name: ipv6-hp-bpf
                 os: linux
-              cilium_log_collector_arm64:
-                arch: arm64
-                name: cilium-log-collector
-                os: linux
+              ${{ if or(eq(parameters.ciliumLogCollectorImage, '__use-default__'), eq(parameters.ciliumLogCollectorImage, '')) }}:
+                cilium_log_collector_arm64:
+                  arch: arm64
+                  name: cilium-log-collector
+                  os: linux
           steps:
             - template: containers/container-template.yaml
               parameters:
@@ -349,30 +358,33 @@ stages:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           strategy:
             matrix:
-              ${{ if eq(parameters.buildIpam, true) }}:
+              ${{ if or(eq(parameters.ipamImage, '__use-default__'), eq(parameters.ipamImage, '')) }}:
                 azure_ipam:
                   name: azure-ipam
                   platforms: linux/amd64 linux/arm64 windows/amd64
-              ${{ if eq(parameters.buildCni, true) }}:
+              ${{ if or(eq(parameters.cniImage, '__use-default__'), eq(parameters.cniImage, '')) }}:
                 cni:
                   name: cni
                   platforms: linux/amd64 linux/arm64 windows/amd64
-              ${{ if eq(parameters.buildCns, true) }}:
+              ${{ if or(eq(parameters.cnsImage, '__use-default__'), eq(parameters.cnsImage, '')) }}:
                 cns:
                   name: cns
                   platforms: linux/amd64 linux/arm64 windows/amd64
               ipv6_hp_bpf:
                 name: ipv6-hp-bpf
                 platforms: linux/amd64 linux/arm64
-              azure_ip_masq_merger:
-                name: azure-ip-masq-merger
-                platforms: linux/amd64 linux/arm64
-              azure_iptables_monitor:
-                name: azure-iptables-monitor
-                platforms: linux/amd64 linux/arm64
-              cilium_log_collector:
-                name: cilium-log-collector
-                platforms: linux/amd64 linux/arm64
+              ${{ if or(eq(parameters.azureIpMasqMergerImage, '__use-default__'), eq(parameters.azureIpMasqMergerImage, '')) }}:
+                azure_ip_masq_merger:
+                  name: azure-ip-masq-merger
+                  platforms: linux/amd64 linux/arm64
+              ${{ if or(eq(parameters.azureIptablesMonitorImage, '__use-default__'), eq(parameters.azureIptablesMonitorImage, '')) }}:
+                azure_iptables_monitor:
+                  name: azure-iptables-monitor
+                  platforms: linux/amd64 linux/arm64
+              ${{ if or(eq(parameters.ciliumLogCollectorImage, '__use-default__'), eq(parameters.ciliumLogCollectorImage, '')) }}:
+                cilium_log_collector:
+                  name: cilium-log-collector
+                  platforms: linux/amd64 linux/arm64
           steps:
             - template: containers/manifest-template.yaml
               parameters:
diff --git a/.pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml
index f490b2f8551..4a624b0b667 100644
--- a/.pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml
@@ -19,18 +19,19 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      AZURE_IPTABLES_MONITOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIptablesMonitorImageOverride'] ]
+      AZURE_IP_MASQ_MERGER_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerImageOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
       IPV6_IMAGE_REGISTRY: acnpublic.azurecr.io
     jobs:
       - job: ${{ parameters.name }}
@@ -60,10 +61,10 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
       IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
 
 
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
index 96b43888979..c79c4373a60 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -35,18 +35,17 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
       IPV6_IMAGE_REGISTRY: acnpublic.azurecr.io
     jobs:
       - job: ${{ parameters.name }}
@@ -78,10 +77,10 @@ stages:
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
       GOBIN: "$(GOPATH)/bin" # Go binaries path
       modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
       IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
       IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
       IPV6_IMAGE_REGISTRY: acnpublic.azurecr.io
diff --git a/.pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml
index bf3abb1e56a..7687c9004fe 100644
--- a/.pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml
@@ -19,18 +19,18 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      AZURE_IPTABLES_MONITOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIptablesMonitorImageOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -59,11 +59,11 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
-      CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+      CURRENT_VERSION: $[ stageDependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
 
 
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
diff --git a/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
index c3a8f5d6037..a62f37a296f 100644
--- a/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
@@ -50,18 +50,17 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -85,11 +84,11 @@ stages:
     displayName: E2E-${{ parameters.displayName }}
     condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION), eq(dependencies.setup.outputs['env.GitDiffCheck.RunCiliumTests'], 'true'))
     variables:
-      TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
-      CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+      CURRENT_VERSION: $[ stageDependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
       IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
diff --git a/.pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml
index 30cd4678ac4..e2d4d3f8806 100644
--- a/.pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml
@@ -19,18 +19,19 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      AZURE_IPTABLES_MONITOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIptablesMonitorImageOverride'] ]
+      AZURE_IP_MASQ_MERGER_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerImageOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -59,9 +60,9 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
 
 
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
index d5a28c8f98e..d2765f80485 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -38,18 +38,17 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -78,9 +77,9 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
 
 
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
index a291bfe2aad..8ccde9c0509 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -35,18 +35,17 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -74,9 +73,9 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
       IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
index 3da82c80c8f..4e5921a4ff5 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -35,18 +35,17 @@ stages:
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     variables:
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
-      CNI_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-      CNS_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
-      IPAM_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
-      CNI_IMAGE_REPO: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
-      CNS_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
-      IPAM_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
-      CNI_IMAGE_NAME_OVERRIDE: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
-      CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE: acnpublic.azurecr.io
-      CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorVersion'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageRepo'] ]
+      IPAM_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageRepo'] ]
+      CNI_IMAGE_REPO: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageRepo'] ]
+      CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
+      IPAM_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamImageNameOverride'] ]
+      CNI_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniImageNameOverride'] ]
+      CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ciliumLogCollectorImageOverride'] ]
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cluster - ${{ parameters.name }}
@@ -74,11 +73,11 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
-      CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
-      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      CNS_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-      AZURE_IPAM_VERSION: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+      CURRENT_VERSION: $[ stageDependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
+      commitID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipamVersion'] ]
 
 
       CNS_IMAGE_NAME_OVERRIDE: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsImageNameOverride'] ]
diff --git a/.pipelines/templates/network-install.yaml b/.pipelines/templates/network-install.yaml
index faf94bfaef0..6268800d23b 100644
--- a/.pipelines/templates/network-install.yaml
+++ b/.pipelines/templates/network-install.yaml
@@ -114,15 +114,15 @@ steps:
           CILIUM_ARGS+=("CILIUM_IMAGE_REGISTRY=${{ parameters.ciliumImageRegistry }}")
         fi
 
+        . ./hack/scripts/parse_override_image.sh
+
         configure_ebpf() {
-          export AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY=acnpublic.azurecr.io
-          export AZURE_IPTABLES_MONITOR_TAG=$(make azure-iptables-monitor-version)
+          export AZURE_IPTABLES_MONITOR_IMAGE=${AZURE_IPTABLES_MONITOR_IMAGE_OVERRIDE:-$(format_image acnpublic.azurecr.io azure-iptables-monitor "$(make azure-iptables-monitor-version)")}
         }
 
         configure_ebpf_overlay() {
           configure_ebpf
-          export AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY=acnpublic.azurecr.io
-          export AZURE_IP_MASQ_MERGER_TAG=$(make azure-ip-masq-merger-version)
+          export AZURE_IP_MASQ_MERGER_IMAGE=${AZURE_IP_MASQ_MERGER_IMAGE_OVERRIDE:-$(format_image acnpublic.azurecr.io azure-ip-masq-merger "$(make azure-ip-masq-merger-version)")}
         }
 
         configure_dualstack() {
@@ -179,8 +179,9 @@ steps:
           LOG_COLLECTOR_ARGS+=("DIR=${CILIUM_DIR}")
         fi
         if [ "${{ parameters.useMakefileLogCollectorDefaults }}" != "True" ]; then
-          export CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY=${CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE:-acnpublic.azurecr.io}
-          export CILIUM_LOG_COLLECTOR_VERSION_TAG=${CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE:-$(make cilium-log-collector-version)}
+          collector_registry=${CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY_OVERRIDE:-acnpublic.azurecr.io}
+          collector_version=${CILIUM_LOG_COLLECTOR_VERSION_TAG_OVERRIDE:-$(make cilium-log-collector-version)}
+          export CILIUM_LOG_COLLECTOR_IMAGE=${CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE:-$(format_image "$collector_registry" cilium-log-collector "$collector_version")}
         fi
         make -C ./hack/aks add-cilium-log-collector "${LOG_COLLECTOR_ARGS[@]}"
         kubectl get pods -A -o wide
diff --git a/azure-ip-masq-merger/Dockerfile b/azure-ip-masq-merger/Dockerfile
index 317d984d865..c66cfb77aa4 100644
--- a/azure-ip-masq-merger/Dockerfile
+++ b/azure-ip-masq-merger/Dockerfile
@@ -4,7 +4,7 @@ ARG ARCH
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 # mcr.microsoft.com/azurelinux/distroless/base:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless
diff --git a/azure-ipam/Dockerfile b/azure-ipam/Dockerfile
index 5cf791cee41..864516f685c 100644
--- a/azure-ipam/Dockerfile
+++ b/azure-ipam/Dockerfile
@@ -6,7 +6,7 @@ ARG OS_VERSION
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core
diff --git a/azure-iptables-monitor/Dockerfile b/azure-iptables-monitor/Dockerfile
index 79522f4bb44..f6e9d5f2512 100644
--- a/azure-iptables-monitor/Dockerfile
+++ b/azure-iptables-monitor/Dockerfile
@@ -9,7 +9,7 @@ FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b
 FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 
 FROM go AS azure-iptables-monitor
diff --git a/cilium-log-collector/Dockerfile b/cilium-log-collector/Dockerfile
index 873b80ddb03..498b6731a5d 100644
--- a/cilium-log-collector/Dockerfile
+++ b/cilium-log-collector/Dockerfile
@@ -4,7 +4,7 @@ ARG ARCH
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 FROM go AS fluent-bit-plugin
 ARG VERSION
diff --git a/cni/Dockerfile b/cni/Dockerfile
index f373993bef9..a5b933caf10 100644
--- a/cni/Dockerfile
+++ b/cni/Dockerfile
@@ -6,7 +6,7 @@ ARG OS_VERSION
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core
diff --git a/cns/Dockerfile b/cns/Dockerfile
index 5ec0fad02d8..521a36fd2d0 100644
--- a/cns/Dockerfile
+++ b/cns/Dockerfile
@@ -5,7 +5,7 @@ ARG OS_VERSION
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:8f638b09830f92f4005c56756cbafdd56d6460f41d2c1fd12b9bc02a5c85434c AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core
diff --git a/hack/aks/deploy.mk b/hack/aks/deploy.mk
index 2259939ced9..e922ef572b0 100644
--- a/hack/aks/deploy.mk
+++ b/hack/aks/deploy.mk
@@ -7,6 +7,7 @@ IPV6_IMAGE_REGISTRY						?= mcr.microsoft.com/containernetworking
 IPV6_HP_BPF_VERSION               		?= v0.0.1
 CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY 	?= mcr.microsoft.com/containernetworking
 CILIUM_LOG_COLLECTOR_VERSION_TAG 		?= v0.0.2-0
+CILIUM_LOG_COLLECTOR_IMAGE				?= $(CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY)/cilium-log-collector:$(CILIUM_LOG_COLLECTOR_VERSION_TAG)
 CILIUM_NIGHTLY_VERSION_TAG 				?= cilium-nightly-pipeline
 WAIT_FOR_CILIUM						?= true
 
@@ -19,8 +20,10 @@ IPV6_IMAGE_REGISTRY           			?= mcr.microsoft.com/containernetworking
 EBPF_CILIUM_VERSION_TAG               	?= v1.18.12-260811
 AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY	?= mcr.microsoft.com/containernetworking
 AZURE_IPTABLES_MONITOR_TAG          	?= v0.0.5-0
+AZURE_IPTABLES_MONITOR_IMAGE			?= $(AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY)/azure-iptables-monitor:$(AZURE_IPTABLES_MONITOR_TAG)
 AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY		?= mcr.microsoft.com/containernetworking
 AZURE_IP_MASQ_MERGER_TAG            	?= v0.0.1-0
+AZURE_IP_MASQ_MERGER_IMAGE				?= $(AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY)/azure-ip-masq-merger:$(AZURE_IP_MASQ_MERGER_TAG)
 
 # so we can use in envsubst
 export IPV6_IMAGE_REGISTRY
@@ -29,13 +32,16 @@ export CILIUM_VERSION_TAG
 export CILIUM_IMAGE_REGISTRY
 export CILIUM_LOG_COLLECTOR_VERSION_TAG
 export CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY
+export CILIUM_LOG_COLLECTOR_IMAGE
 export CILIUM_NIGHTLY_VERSION_TAG
 
 # ebpf
 export AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY
 export AZURE_IPTABLES_MONITOR_TAG
+export AZURE_IPTABLES_MONITOR_IMAGE
 export AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY
 export AZURE_IP_MASQ_MERGER_TAG
+export AZURE_IP_MASQ_MERGER_IMAGE
 
 # print variable targets
 print-cilium-vars:
@@ -55,6 +61,8 @@ print-ebpf-cilium-vars:
 	@echo "EBPF_CILIUM_DIR: $(EBPF_CILIUM_DIR)"
 	@echo "EBPF_CILIUM_IMAGE_REGISTRY: $(EBPF_CILIUM_IMAGE_REGISTRY)"
 	@echo "EBPF_CILIUM_VERSION_TAG: $(EBPF_CILIUM_VERSION_TAG)"
+	@echo "AZURE_IPTABLES_MONITOR_IMAGE: $(AZURE_IPTABLES_MONITOR_IMAGE)"
+	@echo "AZURE_IP_MASQ_MERGER_IMAGE: $(AZURE_IP_MASQ_MERGER_IMAGE)"
 
 wait-for-cilium:
 ifeq ($(WAIT_FOR_CILIUM),true)
@@ -73,10 +81,9 @@ deploy-cilium-agent:
 
 # patch cilium agent (assuming deployed) with server-side applied cilium log collector container
 add-cilium-log-collector:
-	@echo "CILIUM_LOG_COLLECTOR_VERSION_TAG: $(CILIUM_LOG_COLLECTOR_VERSION_TAG)"
-	@echo "CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY: $(CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY)"
+	@echo "CILIUM_LOG_COLLECTOR_IMAGE: $(CILIUM_LOG_COLLECTOR_IMAGE)"
 	kubectl apply --server-side -f ../../test/integration/manifests/cilium/v$(DIR)/cilium-log-collector/cilium-log-collector-configmap.yaml
-	envsubst '$${CILIUM_LOG_COLLECTOR_VERSION_TAG},$${CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY}' < ../../test/integration/manifests/cilium/v$(DIR)/cilium-log-collector/daemonset-patch.yaml | kubectl apply --server-side --field-manager=cilium-log-collector -f -
+	envsubst '$${CILIUM_LOG_COLLECTOR_IMAGE}' < ../../test/integration/manifests/cilium/v$(DIR)/cilium-log-collector/daemonset-patch.yaml | kubectl apply --server-side --field-manager=cilium-log-collector -f -
 	kubectl rollout restart ds cilium -n kube-system
 
 # deploy disable configmap to disable cilium log collector
@@ -150,7 +157,7 @@ deploy-common-ebpf-cilium:
 deploy-ebpf-dualstack-cilium: print-ebpf-cilium-vars deploy-common-ebpf-cilium
 	@kubectl apply -f ../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/dualstack/static/
 	CILIUM_VERSION_TAG=$(EBPF_CILIUM_VERSION_TAG) CILIUM_IMAGE_REGISTRY=$(EBPF_CILIUM_IMAGE_REGISTRY) \
-                envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${IPV6_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_TAG},$${AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY},$${AZURE_IP_MASQ_MERGER_TAG}' < \
+                envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${IPV6_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_IMAGE},$${AZURE_IP_MASQ_MERGER_IMAGE}' < \
                 ../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/dualstack/cilium.yaml \
                 | kubectl apply -f -
 	@$(MAKE) wait-for-cilium
@@ -158,7 +165,7 @@ deploy-ebpf-dualstack-cilium: print-ebpf-cilium-vars deploy-common-ebpf-cilium
 deploy-ebpf-overlay-cilium: print-ebpf-cilium-vars deploy-common-ebpf-cilium
 	@kubectl apply -f ../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/overlay/static/
 	CILIUM_VERSION_TAG=$(EBPF_CILIUM_VERSION_TAG) CILIUM_IMAGE_REGISTRY=$(EBPF_CILIUM_IMAGE_REGISTRY) \
-		envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_TAG},$${AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY},$${AZURE_IP_MASQ_MERGER_TAG}' < \
+		envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${AZURE_IPTABLES_MONITOR_IMAGE},$${AZURE_IP_MASQ_MERGER_IMAGE}' < \
 		../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/overlay/cilium.yaml \
 		| kubectl apply -f -
 	@$(MAKE) wait-for-cilium
@@ -167,7 +174,7 @@ deploy-ebpf-podsubnet-cilium: print-ebpf-cilium-vars deploy-common-ebpf-cilium
 	@kubectl apply -f ../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/podsubnet/static/
 # ebpf podsubnet does not have ip masq merger 
 	CILIUM_VERSION_TAG=$(EBPF_CILIUM_VERSION_TAG) CILIUM_IMAGE_REGISTRY=$(EBPF_CILIUM_IMAGE_REGISTRY) \
-		envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_TAG}' < \
+		envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${AZURE_IPTABLES_MONITOR_IMAGE}' < \
 		../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/podsubnet/cilium.yaml \
 		| kubectl apply -f -
 	@$(MAKE) wait-for-cilium
diff --git a/hack/scripts/parse_override_image.sh b/hack/scripts/parse_override_image.sh
index e58463bebcb..c34225e8148 100644
--- a/hack/scripts/parse_override_image.sh
+++ b/hack/scripts/parse_override_image.sh
@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 
-# parse_override_image returns four values:
-# <useProvidedImage> <repoKey> <imageName> <versionOrDigest>
+# parse_override_image returns three values:
+# <repoKey> <imageName> <versionOrDigest>
 # Input -> output examples:
-# 1) image="__use-default__" => "false ACN <defaultName> <defaultVersion>"
-# 2) image="acnpublic.azurecr.io/azure-cns:v1.2.3" => "true ACN azure-cns v1.2.3"
-# 3) image="mcr.microsoft.com/containernetworking/azure-cni:v1.2.3@sha256:abc" => "true MCR azure-cni v1.2.3@sha256:abc"
+# 1) image="__use-default__" => "ACN <defaultName> <defaultVersion>"
+# 2) image="acnpublic.azurecr.io/azure-cns:v1.2.3" => "ACN azure-cns v1.2.3"
+# 3) image="mcr.microsoft.com/containernetworking/azure-cni:v1.2.3@sha256:abc" => "MCR azure-cni v1.2.3@sha256:abc"
 parse_override_image() {
   image="$1"
   defaultName="$2"
   defaultVersion="$3"
 
   if [ -z "$image" ] || [ "$image" = "__use-default__" ]; then
-    echo "false ACN ${defaultName} ${defaultVersion}"
+    echo "ACN ${defaultName} ${defaultVersion}"
     return
   fi
 
@@ -52,5 +52,29 @@ parse_override_image() {
     version="${pathAndTag##*:}"
   fi
 
-  echo "true ${repo} ${name} ${version}"
+  echo "${repo} ${name} ${version}"
+}
+
+resolve_override_image() {
+  local image="$1"
+
+  if [ -z "$image" ] || [ "$image" = "__use-default__" ]; then
+    format_image "acnpublic.azurecr.io" "$2" "$3"
+    return
+  fi
+
+  echo "$image"
+}
+
+format_image() {
+  local registry="$1"
+  local name="$2"
+  local version="$3"
+
+  if [[ "$version" == @* ]]; then
+    echo "${registry}/${name}${version}"
+    return
+  fi
+
+  echo "${registry}/${name}:${version}"
 }
diff --git a/test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml b/test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml
index da7fbc814f9..11f181745e8 100644
--- a/test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml
+++ b/test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: cilium-fluent-bit
-          image: $CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY/cilium-log-collector:$CILIUM_LOG_COLLECTOR_VERSION_TAG
+          image: $CILIUM_LOG_COLLECTOR_IMAGE
           imagePullPolicy: Always
           command:
             - /fluent-bit/bin/fluent-bit
diff --git a/test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml b/test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml
index 90ef91925ff..febd023f787 100644
--- a/test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml
@@ -165,7 +165,7 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: spec.nodeName
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-iptables-monitor
         resources: {}
@@ -188,7 +188,7 @@ spec:
         - ./azure-ip-masq-merger
         - -v
         - "2"
-        image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+        image: $AZURE_IP_MASQ_MERGER_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-ip-masq-merger
         resources: {}
@@ -206,7 +206,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: iptables-blocker-init
         resources: {}
diff --git a/test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml b/test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml
index 2d80205e3d6..77c1f7bd2a2 100644
--- a/test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -205,7 +205,7 @@ spec:
             - ./azure-ip-masq-merger
             - -v
             - "2"
-          image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+          image: $AZURE_IP_MASQ_MERGER_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-ip-masq-merger
           resources: {}
@@ -223,7 +223,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -248,7 +248,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}
diff --git a/test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml b/test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml
index 3e3054f41e8..750092ea132 100644
--- a/test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -208,7 +208,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -233,7 +233,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}
diff --git a/test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml b/test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml
index da7fbc814f9..11f181745e8 100644
--- a/test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml
+++ b/test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: cilium-fluent-bit
-          image: $CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY/cilium-log-collector:$CILIUM_LOG_COLLECTOR_VERSION_TAG
+          image: $CILIUM_LOG_COLLECTOR_IMAGE
           imagePullPolicy: Always
           command:
             - /fluent-bit/bin/fluent-bit
diff --git a/test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml b/test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml
index 2f8a15fc157..83a6213c3c9 100644
--- a/test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml
@@ -165,7 +165,7 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: spec.nodeName
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-iptables-monitor
         resources: {}
@@ -188,7 +188,7 @@ spec:
         - ./azure-ip-masq-merger
         - -v
         - "2"
-        image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+        image: $AZURE_IP_MASQ_MERGER_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-ip-masq-merger
         resources: {}
@@ -206,7 +206,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: iptables-blocker-init
         resources: {}
diff --git a/test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml b/test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml
index b2ac592f6fb..620600be862 100644
--- a/test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -205,7 +205,7 @@ spec:
             - ./azure-ip-masq-merger
             - -v
             - "2"
-          image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+          image: $AZURE_IP_MASQ_MERGER_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-ip-masq-merger
           resources: {}
@@ -223,7 +223,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -248,7 +248,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}
diff --git a/test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml b/test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml
index 9ac19c59bda..7a5ba1115b8 100644
--- a/test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -208,7 +208,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -233,7 +233,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}
diff --git a/test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml b/test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml
index da7fbc814f9..11f181745e8 100644
--- a/test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml
+++ b/test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: cilium-fluent-bit
-          image: $CILIUM_LOG_COLLECTOR_IMAGE_REGISTRY/cilium-log-collector:$CILIUM_LOG_COLLECTOR_VERSION_TAG
+          image: $CILIUM_LOG_COLLECTOR_IMAGE
           imagePullPolicy: Always
           command:
             - /fluent-bit/bin/fluent-bit
diff --git a/test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml b/test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml
index 0c6a8e61979..44934679c15 100644
--- a/test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml
@@ -165,7 +165,7 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: spec.nodeName
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-iptables-monitor
         resources: {}
@@ -188,7 +188,7 @@ spec:
         - ./azure-ip-masq-merger
         - -v
         - "2"
-        image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+        image: $AZURE_IP_MASQ_MERGER_IMAGE
         imagePullPolicy: IfNotPresent
         name: azure-ip-masq-merger
         resources: {}
@@ -206,7 +206,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-        image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+        image: $AZURE_IPTABLES_MONITOR_IMAGE
         imagePullPolicy: IfNotPresent
         name: iptables-blocker-init
         resources: {}
diff --git a/test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml b/test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml
index cead7fcfb47..0c312025aa4 100644
--- a/test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -205,7 +205,7 @@ spec:
             - ./azure-ip-masq-merger
             - -v
             - "2"
-          image: $AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY/azure-ip-masq-merger:$AZURE_IP_MASQ_MERGER_TAG
+          image: $AZURE_IP_MASQ_MERGER_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-ip-masq-merger
           resources: {}
@@ -223,7 +223,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -248,7 +248,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}
diff --git a/test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml b/test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml
index 16afa878759..056f68cab44 100644
--- a/test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml
+++ b/test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml
@@ -185,7 +185,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor
           resources: {}
@@ -208,7 +208,7 @@ spec:
             - /azure-block-iptables
             - -mode=attach
             - -overwrite=true
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: iptables-blocker-init
           resources: {}
@@ -233,7 +233,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: $AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY/azure-iptables-monitor:$AZURE_IPTABLES_MONITOR_TAG
+          image: $AZURE_IPTABLES_MONITOR_IMAGE
           imagePullPolicy: IfNotPresent
           name: azure-iptables-monitor-init
           resources: {}