diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 139d0510..926279d0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,17 +15,12 @@
 name: CI Pipeline
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-    branches:
-      - main
   push:
     tags:
       - "*"
     branches:
       - "pull-request/[0-9]+"
       - main
-      - ci
       - release-*
 
 jobs:
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index d86ac307..052a1775 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -29,7 +29,11 @@ jobs:
         arch:
           - amd64
 #          - arm64
-    runs-on: ubuntu-latest
+    runs-on: linux-${{ matrix.arch }}-cpu4
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
     steps:
       - uses: actions/checkout@v4
         name: Check out code
@@ -57,10 +61,14 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup Go Proxy
+        id: setup-go-proxy
+        uses: nv-gha-runners/setup-artifactory-go-proxy@main
       - name: Build image
         env:
           IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/nvidia-sandbox-device-plugin
           VERSION: ${COMMIT_SHORT_SHA}-${{ matrix.arch }}
+          GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
           DOCKER_BUILD_PLATFORM_OPTIONS: "--platform=linux/${{ matrix.arch }}"
         run: |
           echo "${VERSION}"
diff --git a/Dockerfile b/Dockerfile
index 44f96136..076d5a82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,7 +72,6 @@ LABEL summary="NVIDIA Sandbox Device Plugin"
 LABEL description="See summary"
 
 COPY --from=builder /go/src/sandbox-device-plugin/nvidia-sandbox-device-plugin /usr/bin/
-COPY --link --from=builder /go/src/sandbox-device-plugin/nvidia-sandbox-device-plugin /usr/bin/nvidia-kubevirt-gpu-device-plugin
 COPY --from=builder /go/src/sandbox-device-plugin/utils/pci.ids /usr/pci.ids
 COPY --from=gfd /usr/bin/gpu-feature-discovery /usr/bin/gpu-feature-discovery
 
diff --git a/deployments/container/Dockerfile.distroless b/deployments/container/Dockerfile.distroless
index 320998bb..cd729119 100644
--- a/deployments/container/Dockerfile.distroless
+++ b/deployments/container/Dockerfile.distroless
@@ -24,12 +24,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-FROM nvcr.io/nvidia/k8s-device-plugin:v0.17.0 as gfd
+FROM nvcr.io/nvidia/k8s-device-plugin:v0.18.2 as gfd
 
 FROM nvcr.io/nvidia/cuda:13.0.2-base-ubi9 as builder
 
 RUN yum install -y wget make gcc
 
+ARG GOPROXY="https://proxy.golang.org,direct"
+ENV GOPROXY=$GOPROXY
+
 ARG GOLANG_VERSION=1.25.6
 RUN set -eux; \
     \
@@ -72,7 +75,6 @@ LABEL summary="NVIDIA Sandbox Device Plugin"
 LABEL description="See summary"
 
 COPY --from=builder /go/src/sandbox-device-plugin/nvidia-sandbox-device-plugin /usr/bin/
-COPY --link --from=builder /go/src/sandbox-device-plugin/nvidia-sandbox-device-plugin /usr/bin/nvidia-kubevirt-gpu-device-plugin
 COPY --from=builder /go/src/sandbox-device-plugin/utils/pci.ids /usr/pci.ids
 COPY --from=gfd /usr/bin/gpu-feature-discovery /usr/bin/gpu-feature-discovery