diff --git a/.github/workflows/docker-images-reusable.yml b/.github/workflows/docker-images-reusable.yml
index 8f0b41a..0e7ed7a 100644
--- a/.github/workflows/docker-images-reusable.yml
+++ b/.github/workflows/docker-images-reusable.yml
@@ -46,19 +46,16 @@ jobs:
         run: |
           make build-${{ inputs.service_name }} VERSION=latest
 
-      - name: Tag Docker Image
-        run: |
-          docker tag datamate-${{ inputs.service_name }}:latest ${{ steps.set-tag.outputs.TAGS }}
-
-      - name: Push Docker Image
+      - name: Tag & Push Docker Image
         if: github.event_name != 'pull_request' && !startsWith(github.workflow, 'Package')
         run: |
+          docker tag datamate-${{ inputs.service_name }}:latest ${{ steps.set-tag.outputs.TAGS }}
           docker push ${{ steps.set-tag.outputs.TAGS }}
 
       - name: Save Docker Image
         if: startsWith(github.workflow, 'Package')
         run: |
-          docker save -o datamate-${{ inputs.service_name }}.tar ${{ steps.set-tag.outputs.TAGS }}
+          docker save -o datamate-${{ inputs.service_name }}.tar datamate-${{ inputs.service_name }}:latest
 
       - name: Upload Docker Image
         if: startsWith(github.workflow, 'Package')
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 5eeaf78..2b591d1 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Save Image
+      - name: Download Image
         uses: actions/download-artifact@v5
         with:
           path: images
@@ -54,5 +54,8 @@ jobs:
       - name: Upload Package
         uses: actions/upload-artifact@v4
         with:
-          name: package
-          path: datamate.tar
\ No newline at end of file
+          name: datamate
+          include-hidden-files: true
+          path: |
+            deployment/
+            images/
\ No newline at end of file