diff --git a/.github/workflows/build-and-upload-image.yaml b/.github/workflows/build-and-upload-image.yaml
index 1a70215..0ba1f30 100644
--- a/.github/workflows/build-and-upload-image.yaml
+++ b/.github/workflows/build-and-upload-image.yaml
@@ -7,10 +7,6 @@ on:
         required: true
         type: string
 
-      imageName:
-        required: true
-        type: string
-
       imageTag:
         required: true
         type: string
@@ -24,7 +20,7 @@ on:
         required: true
 
 env:
-  REGISTRY: ghcr.io
+  REGISTRY: ghcr.io/ateleris/nvshare
 
 jobs:
   build-and-push-image:
@@ -51,12 +47,12 @@ jobs:
           context: .
           file: ${{ inputs.dockerfile }}
           push: true
-          tags: ${{ env.REGISTRY }}/${{ inputs.imageName }}:${{ inputs.imageTag }}
+          tags: ${{ env.REGISTRY }}:${{ inputs.imageTag }}
       
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
-          subject-name: ${{ env.REGISTRY }}/${{ inputs.imageName }}:${{ inputs.imageTag }}
+          subject-name: ${{ env.REGISTRY }}:${{ inputs.imageTag }}
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
       
diff --git a/.github/workflows/build-device-plugin.yaml b/.github/workflows/build-device-plugin.yaml
index ffa42f3..e1e6aa2 100644
--- a/.github/workflows/build-device-plugin.yaml
+++ b/.github/workflows/build-device-plugin.yaml
@@ -12,7 +12,6 @@ jobs:
     with:
       actor: ${{ github.actor }}
       dockerfile: Dockerfile.device_plugin
-      imageName: nvshare-device-plugin
-      imageTag: latest
+      imageTag: device-plugin-latest
     secrets:
       ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-libnvshare.yaml b/.github/workflows/build-libnvshare.yaml
index 5c78c82..870d07b 100644
--- a/.github/workflows/build-libnvshare.yaml
+++ b/.github/workflows/build-libnvshare.yaml
@@ -12,7 +12,6 @@ jobs:
     with:
       actor: ${{ github.actor }}
       dockerfile: Dockerfile.libnvshare
-      imageName: nvshare-libnvshare
-      imageTag: latest
+      imageTag: libnvshare-latest
     secrets:
       ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-scheduler.yaml b/.github/workflows/build-scheduler.yaml
index 708f5dc..703782c 100644
--- a/.github/workflows/build-scheduler.yaml
+++ b/.github/workflows/build-scheduler.yaml
@@ -12,7 +12,6 @@ jobs:
     with:
       actor: ${{ github.actor }}
       dockerfile: Dockerfile.scheduler
-      imageName: nvshare-scheduler
-      imageTag: latest
+      imageTag: scheduler-latest
     secrets:
       ghToken: ${{ secrets.GITHUB_TOKEN }}