diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index 4069239009..2c79bf3d09 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -48,15 +48,16 @@ jobs:
         cluster_id: [1]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: scripts
       - uses: FedericoCarboni/setup-ffmpeg@v1
       - uses: actions/setup-node@v2
         if: ${{ !env.ACT }}
         with:
           node-version: '14'
+      - uses: actions/download-artifact@v2
+        with:
+          name: database
+          path: scripts/database
+      - run: ls scripts/database
       - run: npm install
       - run: npm run cluster:load -- --cluster-id=${{ matrix.cluster_id }}
       - uses: actions/upload-artifact@v2
@@ -86,15 +87,15 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: data
-          path: scripts
+          path: scripts/data
       - uses: actions/download-artifact@v2
         with:
           name: database
-          path: scripts
+          path: scripts/database
       - uses: actions/download-artifact@v2
         with:
           name: logs
-          path: scripts
+          path: scripts/logs
       - run: npm install
       - run: npm run db:update
       - uses: actions/upload-artifact@v2
@@ -102,8 +103,6 @@ jobs:
           name: database
           path: scripts/database
       - run: npm run playlist:update
-      - run: git add streams/*
-      - run: git commit -m "[Bot] Update streams"
       - run: npm run playlist:generate
       - uses: actions/upload-artifact@v2
         with:
@@ -131,9 +130,14 @@ jobs:
           commit-message: '[Bot] Deploy to iptv-org/api'
           clean: false
       - run: npm run readme:update
-      - run: git add README.md
-      - run: git commit -m "[Bot] Update README.md"
-      - run: git push -u origin ${{ steps.create-branch-name.outputs.branch_name }}
+      - name: Commit Changes
+        if: ${{ !env.ACT }}
+        run: |
+          git add streams/*
+          git commit -m "[Bot] Update streams"
+          git add README.md
+          git commit -m "[Bot] Update README.md"
+          git push -u origin ${{ steps.create-branch-name.outputs.branch_name }}
       - uses: repo-sync/pull-request@v2
         if: ${{ !env.ACT }}
         id: pull-request