diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ece6a918..62a03808 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -43,6 +43,11 @@ jobs:
       with:
         fetch-depth: 0
         ref: ${{ github.ref_name}}
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+        check-latest: true
     - name: Build and push all image variations
       run: |
         make operator
diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
index 952ec7d6..c44daf5d 100644
--- a/.github/workflows/scan.yaml
+++ b/.github/workflows/scan.yaml
@@ -1,9 +1,11 @@
 name: Scan
 on:
   pull_request:
+    branches:
+      - release-v2.7
   push:
     branches:
-      - master
+      - release-v2.7
     tags:
       - "v*"
 jobs:
@@ -14,6 +16,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+      - name: Build operator
+        run: make operator
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.9.1
@@ -24,7 +33,7 @@ jobs:
           tags: ghcr.io/rancher/aks-operator:${{ github.sha }}
           load: true
           push: false
-          file: test/e2e/Dockerfile.e2e
+          file: package/Dockerfile
           build-args: |
             TAG=${{ github.sha }}
             REPO=ghcr.io/rancher/aks-operator
diff --git a/.trivyignore b/.trivyignore
index 903b81bd..fb30ba70 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -1,3 +1,4 @@
 # Requires upgrading to Go 1.21 but we can't do this before Rancher v2.7 gets updated 
 CVE-2023-45288
-CVE-2024-24790
\ No newline at end of file
+CVE-2024-24790
+CVE-2024-34156
\ No newline at end of file
diff --git a/package/Dockerfile b/package/Dockerfile
index 8656690c..8f6c41c9 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -1,8 +1,8 @@
-FROM registry.suse.com/bci/bci-base:15.5 AS builder
+FROM registry.suse.com/bci/bci-base:15.6 AS builder
 RUN sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd
 RUN useradd --uid 1007 aks-operator
 
-FROM registry.suse.com/bci/bci-micro:15.5
+FROM registry.suse.com/bci/bci-micro:15.6
 COPY --from=builder /etc/passwd /etc/passwd
 COPY --from=builder /etc/shadow /etc/shadow