diff --git a/.github/actions/nightly-release/action.yaml b/.github/actions/nightly-release/action.yaml
index a2376354..7fab7dd6 100644
--- a/.github/actions/nightly-release/action.yaml
+++ b/.github/actions/nightly-release/action.yaml
@@ -10,6 +10,18 @@ inputs:
     description: The label to use for built images
     required: true
 
+  hub_username:
+    description: Docker hub username
+    required: true
+
+  hub_password:
+    description: Docker hub password
+    required: true
+
+  workdir:
+    description: The working directory for actions requiring it
+    required: true
+
 runs:
   using: composite
   steps:
@@ -20,27 +32,26 @@ runs:
 
     - name: goreleaser
       uses: goreleaser/goreleaser-action@v3
-      env:
-        LABEL:
       with:
+        workdir: "${{ inputs.workdir }}"
         version: latest
         args: release --snapshot --config .goreleaser-nightly.yml
 
     - name: images
+      shell: bash
+      run: docker images
+
+    - name: docker_login
+      shell: bash
+      run: docker login -u "${{ inputs.hub_username }}" -p "${{ inputs.hub_password }}"
+
+    - name: docker_push
       shell: bash
       run: |
-        docker images
-
-        - name: docker_login
-          run: |
-            docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}"
-
-        - name: docker_push
-          run: |
-            NDATE=$(date +%Y%m%d)
-        
-            docker tag synadia/nats-server:nightly-${NDATE} synadia/nats-server:${{ inputs.label }}-${NDATE}
-            docker tag synadia/nats-server:nightly-${NDATE} synadia/nats-server:${{ inputs.label }}
-        
-            docker push synadia/nats-server:${{ inputs.label }}-${NDATE}
-            docker push synadia/nats-server:${{ inputs.label }}
+        NDATE=$(date +%Y%m%d)
+    
+        docker tag synadia/nats-server:nightly-${NDATE} synadia/nats-server:${{ inputs.label }}-${NDATE}
+        docker tag synadia/nats-server:nightly-${NDATE} synadia/nats-server:${{ inputs.label }}
+    
+        docker push synadia/nats-server:${{ inputs.label }}-${NDATE}
+        docker push synadia/nats-server:${{ inputs.label }}
diff --git a/.github/workflows/rc_nightly.yaml b/.github/workflows/rc_nightly.yaml
index c8d02107..29e16bd8 100644
--- a/.github/workflows/rc_nightly.yaml
+++ b/.github/workflows/rc_nightly.yaml
@@ -19,4 +19,7 @@ jobs:
       - uses: ./src/github.com/nats-io/nats-server/.github/actions/nightly-release
         with:
           go: "1.19"
+          workdir: src/github.com/nats-io/nats-server
           label: nightly-main
+          hub_username: "${{ secrets.DOCKER_USERNAME }}"
+          hub_password: "${{ secrets.DOCKER_PASSWORD }}"
\ No newline at end of file