diff --git a/.github/workflows/e2e-azure-cc-enclave.yaml b/.github/workflows/e2e-azure-cc-enclave.yaml
index 0cb311480..b1d3eae46 100644
--- a/.github/workflows/e2e-azure-cc-enclave.yaml
+++ b/.github/workflows/e2e-azure-cc-enclave.yaml
@@ -9,11 +9,11 @@ on:
       core_image_version:
         description: 'The version of UID2 core image'
         type: string
-        default: '2.15.0-50d596678a-default'
+        default: 'latest'
       optout_image_version:
         description: 'The version of UID2 optout image'
         type: string
-        default: '2.6.18-60727cf243-default'
+        default: 'latest'
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/publish-azure-cc-enclave-docker.yaml b/.github/workflows/publish-azure-cc-enclave-docker.yaml
index 05d0f61e9..f0b53f720 100644
--- a/.github/workflows/publish-azure-cc-enclave-docker.yaml
+++ b/.github/workflows/publish-azure-cc-enclave-docker.yaml
@@ -35,7 +35,7 @@ env:
   REGISTRY: ghcr.io
   MAVEN_PROFILE: azure
   ENCLAVE_PROTOCOL: azure-cc
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: uid2-operator-azure
   DOCKER_CONTEXT_PATH: scripts/azure-cc
   ARTIFACTS_OUTPUT_DIR: ${{ github.workspace }}/deployment-artifacts
 
@@ -217,7 +217,7 @@ jobs:
       - name: Generate release archive
         if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
         run: |
-          zip -j ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-deployment-artifacts-${{ steps.meta.outputs.version }}.zip ${{ env.ARTIFACTS_OUTPUT_DIR }}/*
+          zip -j ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-azure-deployment-artifacts-${{ steps.meta.outputs.version }}.zip ${{ env.ARTIFACTS_OUTPUT_DIR }}/*
 
       - name: Build Changelog
         id: github_release
@@ -240,7 +240,7 @@ jobs:
           body: ${{ steps.github_release.outputs.changelog }}
           draft: true
           files: |
-            ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-deployment-artifacts-${{ steps.meta.outputs.version }}.zip
+            ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-azure-deployment-artifacts-${{ steps.meta.outputs.version }}.zip
   
   e2e:
     name: E2E
diff --git a/e2e/prepare_azure_cc_artifacts.sh b/e2e/prepare_azure_cc_artifacts.sh
index 3d1c02431..bc865cc15 100644
--- a/e2e/prepare_azure_cc_artifacts.sh
+++ b/e2e/prepare_azure_cc_artifacts.sh
@@ -9,7 +9,7 @@ if [ -z "$IMAGE_VERSION" ]; then
   exit 1
 fi
 
-IMAGE="ghcr.io/iabtechlab/uid2-operator:$IMAGE_VERSION"
+IMAGE="ghcr.io/iabtechlab/uid2-operator-azure:$IMAGE_VERSION"
 
 if [ -d "$OUT_PUT_DIR" ]; then
   echo "$OUT_PUT_DIR  exist."
diff --git a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh
index 97c4c5a47..5463d8310 100644
--- a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh
+++ b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh
@@ -2,7 +2,7 @@
 set -x
 
 # Following environment variables must be set
-# - IMAGE: uid2-operator image
+# - IMAGE: uid2-operator-azure image
 # - OUTPUT_DIR: output directory to store the artifacts
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )