--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -113,23 +113,25 @@
         run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate
 
       - name: Wait for 15m
-        run: sleep 900s
+        run: sleep 600s
 
       - name: Collect Docker Logs
         if: success() || failure()
         uses: jwalton/gh-docker-logs@v2.2.0
         with:
-          dest: './fpu-logs'
+          dest: './fpu-logs.${{ matrix.feature }}'
           images: 'node-parachain' 
+
       - name: Tar logs
         if: success() || failure()
-        run: tar cvzf ./fpu-logs.tgz ./fpu-logs
+        run: tar cvzf ./fpu-logs.${{ matrix.feature }}.tgz ./fpu-logs.${{ matrix.feature }}
+
       - name: Upload logs to GitHub
         if: success() || failure()
         uses: actions/upload-artifact@master
         with:
-          name: forkless-parachain-upgrade-logs.tgz
-          path: ./fpu-logs.tgz
+          name: fpu-logs.${{ matrix.feature }}.tgz
+          path: ./fpu-logs.${{ matrix.feature }}.tgz
 
 
 #      - name: Test Report
@@ -145,8 +147,6 @@
 #        run: |
 #          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"
 
-      - name: Wait for 15m
-        run: sleep 900s
 
       - name: Stop running containers
         if: always()                   # run this step always