diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2dcc3c80b1..2650ca9ed8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,6 +14,6 @@
 /dropgz/                    @rbtr @camrynl @paulyufan2 @ashvindeodhar @thatmattlong
 /npm/                       @azure/acn-npm-reviewers
 /zapai/                     @rbtr @ZetaoZhuang
-/bpf-prog/                  @camrynl
+/bpf-prog/                  @camrynl @QxBytes @santhoshmprabhu
 /azure-ip-masq-merger/      @QxBytes @santhoshmprabhu
 /azure-iptables-monitor/    @QxBytes @santhoshmprabhu
diff --git a/cni/Dockerfile b/cni/Dockerfile
index 172b4f9dbb..e67b453456 100644
--- a/cni/Dockerfile
+++ b/cni/Dockerfile
@@ -6,7 +6,7 @@ ARG OS_VERSION
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:aebcc1ff14e0d0523e18dacfaf93b4a6683759995ca19e1ae86254bf5af4ee9e AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:52da06982153e87569d588c8d25dc519903e92f740fc0d7770f38dfd9f7bb0f2 AS go
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:e9bb4e5a79123f2ae29dc601f68adf63a636a455c4259423712b06b798cb201e AS mariner-core
diff --git a/cns/Dockerfile b/cns/Dockerfile
index 95f6e8efd2..7e132e6632 100644
--- a/cns/Dockerfile
+++ b/cns/Dockerfile
@@ -5,7 +5,7 @@ ARG OS_VERSION
 ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:aebcc1ff14e0d0523e18dacfaf93b4a6683759995ca19e1ae86254bf5af4ee9e AS go
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:52da06982153e87569d588c8d25dc519903e92f740fc0d7770f38dfd9f7bb0f2 AS go
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM mcr.microsoft.com/azurelinux/base/core@sha256:e9bb4e5a79123f2ae29dc601f68adf63a636a455c4259423712b06b798cb201e AS mariner-core