diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 40f79c4..ec571a0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -28,6 +28,6 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
       options: --set BASE_REPO="ghcr.io/uds-packages"
-      runsOn: ${{ matrix.architecture == 'arm64' && 'appstore-4-core-arm64' || 'appstore-4-core-amd64' }}
+      runsOn: ${{ matrix.architecture == 'arm64' && 'appstore-8-core-arm64' || 'appstore-8-core-amd64' }}
       uds-releaser: true
     secrets: inherit # Inherits all secrets from the parent workflow.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d9f7263..f3b6221 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -45,10 +45,11 @@ jobs:
     with:
       timeout: 30
       options: --set BASE_REPO="ghcr.io/uds-packages"
-      runsOn: appstore-4-core-amd64
+      runsOn: appstore-8-core-amd64
       upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
       flavor: ${{ matrix.flavor }}
       type: ${{ matrix.type }}
+
     secrets: inherit # Inherits all secrets from the parent workflow.
 
   verify-test:
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
index 8a521c8..4f7ec0d 100644
--- a/values/upstream-values.yaml
+++ b/values/upstream-values.yaml
@@ -19,10 +19,17 @@ cve:
   scanner:
     image:
       repository: neuvector/scanner
-      tag: latest
+      tag: "6"
+    volumes:
+      - name: internal-cert-dir
+        emptyDir:
+          sizeLimit: 50Mi
+    volumeMounts:
+      - mountPath: /etc/neuvector/certs/internal/
+        name: internal-cert-dir
 
   updater:
     enabled: true
     image:
       repository: neuvector/updater
-      tag: latest
+      tag: "0.0.10"
diff --git a/zarf.yaml b/zarf.yaml
index a7642a2..e232d91 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -37,8 +37,8 @@ components:
     images:
       - docker.io/neuvector/controller:5.5.0
       - docker.io/neuvector/manager:5.5.0
-      - docker.io/neuvector/updater:latest
-      - docker.io/neuvector/scanner:latest
+      - docker.io/neuvector/updater:0.0.10
+      - docker.io/neuvector/scanner:6
       - docker.io/neuvector/enforcer:5.5.0
 
   - name: neuvector