diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
index c02ac05f3..ff06e0f43 100644
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@@ -134,9 +134,9 @@ jobs:
       publish-container: true
       image-repository-prefix: ${{ format('ghcr.io/{0}', github.repository) }}
       overlay-branch: ${{ inputs.release-branch }}
+      image-registry-user: ${{ github.actor }}
 
     secrets:
-      image-registry-user: ${{ github.actor }}
       image-registry-password: ${{ secrets.GITHUB_TOKEN }}
   
     permissions:
diff --git a/.github/workflows/export-workspaces-as-dynamic.yaml b/.github/workflows/export-workspaces-as-dynamic.yaml
index 029d85c5f..15f569206 100644
--- a/.github/workflows/export-workspaces-as-dynamic.yaml
+++ b/.github/workflows/export-workspaces-as-dynamic.yaml
@@ -2,15 +2,16 @@ name: Export Workspace as Dynamic Plugins Packages
 on:
   workflow_call:
     secrets:
-      image-registry-user:
-        description: User name to be used to push to container image registry
-        required: false
-
       image-registry-password:
         description: Password to be used to push to container image registry
         required: false
 
     inputs:
+      image-registry-user:
+        description: User name to be used to push to container image registry
+        type: string
+        required: false
+
       node-version:
         description: node-version to execute the export
         type: string
@@ -127,9 +128,9 @@ jobs:
       workspace-path: ${{ inputs.workspace-path }}
       publish-container: ${{ inputs.publish-container }}
       image-repository-prefix: ${{ inputs.image-repository-prefix }}
+      image-registry-user: ${{ secrets.image-registry-user || github.actor }}
       
     secrets:
-      image-registry-user: ${{ secrets.image-registry-user || github.actor }}
       image-registry-password: ${{ secrets.image-registry-password || secrets.GITHUB_TOKEN }}
 
     permissions:
diff --git a/.github/workflows/pr-actions.yaml b/.github/workflows/pr-actions.yaml
index bd83895dc..c68dbc9f3 100644
--- a/.github/workflows/pr-actions.yaml
+++ b/.github/workflows/pr-actions.yaml
@@ -164,7 +164,7 @@ jobs:
 
     if: needs.parse.outputs.command_name == 'publish' && needs.prepare.outputs.overlay-branch != '' && needs.prepare.outputs.workspace != ''
 
-    uses: redhat-developer/rhdh-plugin-export-utils/.github/workflows/export-workspaces-as-dynamic.yaml@main
+    uses: rostalan/rhdh-plugin-export-utils/.github/workflows/export-workspaces-as-dynamic.yaml@main
     with:
       overlay-branch: ${{ needs.prepare.outputs.overlay-branch }}
       overlay-repo: ${{ needs.prepare.outputs.overlay-repo }}
@@ -172,9 +172,9 @@ jobs:
       publish-container: true
       image-repository-prefix: ${{ format('ghcr.io/{0}', github.repository) }}
       image-tag-prefix: ${{ format('pr_{0}__', needs.prepare.outputs.pr-number) }}
+      image-registry-user: ${{ github.actor }}
 
     secrets:
-      image-registry-user: ${{ github.actor }}
       image-registry-password: ${{ secrets.GITHUB_TOKEN }}
 
     permissions:
diff --git a/.github/workflows/publish-release-branch-workspace-plugins.yaml b/.github/workflows/publish-release-branch-workspace-plugins.yaml
index e0da11dbf..997747f56 100644
--- a/.github/workflows/publish-release-branch-workspace-plugins.yaml
+++ b/.github/workflows/publish-release-branch-workspace-plugins.yaml
@@ -69,9 +69,9 @@ jobs:
       image-repository-prefix: ${{ format('ghcr.io/{0}', github.repository) }}
       last-publish-commit: ${{ needs.prepare.outputs.last-published-commit }}
       image-tag-prefix: ${{ github.ref_name == 'main' && 'next__' || '' }}
+      image-registry-user: ${{ github.actor }}
 
     secrets:
-      image-registry-user: ${{ github.actor }}
       image-registry-password: ${{ secrets.GITHUB_TOKEN }}
   
     permissions:
diff --git a/workspaces/acr/plugins-list.yaml b/workspaces/acr/plugins-list.yaml
index f6b1f2490..9f8b3b96d 100644
--- a/workspaces/acr/plugins-list.yaml
+++ b/workspaces/acr/plugins-list.yaml
@@ -1 +1,2 @@
-plugins/acr:
\ No newline at end of file
+plugins/acr:
+#
\ No newline at end of file