diff --git a/.github/workflows/e2e-docker.yml b/.github/workflows/e2e-docker.yml
index 0fafc410ae4..187cb752fa0 100644
--- a/.github/workflows/e2e-docker.yml
+++ b/.github/workflows/e2e-docker.yml
@@ -76,14 +76,14 @@ jobs:
       uses: actions/cache@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-docker-preprod
+        key: node-db-docker-linux-preprod
 
     - name: 💾 Cache wallet db
       id: cache-wallet
       uses: actions/cache@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-docker-linux-preprod
 
     - name: 🚀 Start node and wallet
       run: |
@@ -92,7 +92,7 @@ jobs:
 
         NODE=${{steps.cardano-node-tag.outputs.NODE_TAG}} \
         NODE_CONFIG_PATH=`pwd`/state/configs/preprod \
-        DATA=`pwd`/state/node_db/preprod \
+        DATA=`pwd`/state/node_db/preprod \${{ runner.os }}
         WALLET_DATA=`pwd`/state/wallet_db/preprod \
         docker-compose -f docker-compose-test.yml up --detach
 
@@ -115,7 +115,7 @@ jobs:
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: ${{ runner.os }}-docker-logs
+        name: linux-docker-logs
         path: test/e2e/state/logs
 
     - name: Stop docker-compose
@@ -126,14 +126,14 @@ jobs:
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-docker-linux-preprod
 
     - name: 💾 GH Save Cache of wallet db
       if: always()
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-docker-linux-preprod
 
     - name: Slack Notification on failure
       if: failure()
diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
index 9b795959471..779d9baf7ed 100644
--- a/.github/workflows/e2e-linux.yml
+++ b/.github/workflows/e2e-linux.yml
@@ -47,23 +47,30 @@ jobs:
       uses: actions/cache@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-linux-preprod
 
     - name: 💾 Cache wallet db
       id: cache-wallet
       uses: actions/cache@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2e-linux-preprod
 
     - name: Fetch preprod snapshot
       if: steps.cache-node.outputs.cache-hit != 'true'
       run: |
-        mkdir -p state/node_db/preprod
-        curl -o - https://downloads.csnapshots.io/snapshots/testnet/$(curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json | jq -r .[].file_name ) \
-            | lz4 -c -d - | tar -x -C state/node_db/preprod
-        mv state/node_db/preprod/db/* state/node_db/preprod
-        rmdir state/node_db/preprod/db
+        mkdir state
+        cd state
+        mkdir node_db
+        cd node_db
+        mkdir preprod
+        cd preprod
+        curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json \
+            | jq -r .[].file_name > snapshot.json
+        curl -o - \
+            https://downloads.csnapshots.io/snapshots/testnet/$(cat snapshot.json) \
+            | lz4 -c -d - | tar -x -C .
+        mv db/* .
 
     - name: ⚙️ Setup (get latest bins and configs and decode fixtures)
       run: rake setup[preprod,$BRANCH]
@@ -88,20 +95,20 @@ jobs:
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-linux-preprod
 
     - name: 💾 GH Save Cache of wallet db
       if: always()
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2e-linux-preprod
 
     - name: 📎 Upload state
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: ${{ runner.os }}-state
+        name: linux-state
         path: |
           test/e2e/state/logs
           test/e2e/state/configs
diff --git a/.github/workflows/e2e-macos.yml b/.github/workflows/e2e-macos.yml
index 6743fe45bdf..9e314148e67 100644
--- a/.github/workflows/e2e-macos.yml
+++ b/.github/workflows/e2e-macos.yml
@@ -50,23 +50,31 @@ jobs:
       uses: actions/cache@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-macos-preprod
 
     - name: 💾 Cache wallet db
       id: cache-wallet
       uses: actions/cache@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2-emacos-preprod
 
     - name: Fetch preprod snapshot
       if: steps.cache-node.outputs.cache-hit != 'true'
       run: |
-        mkdir -p state/node_db/preprod
-        curl -o - https://downloads.csnapshots.io/snapshots/testnet/$(curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json | jq -r .[].file_name ) \
-            | lz4 -c -d - | tar -x -C state/node_db/preprod
-        mv state/node_db/preprod/db/* state/node_db/preprod
-        rmdir state/node_db/preprod/db
+        mkdir state
+        cd state
+        mkdir node_db
+        cd node_db
+        mkdir preprod
+        cd preprod
+        curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json \
+            | jq -r .[].file_name > snapshot.json
+        curl -o - \
+            https://downloads.csnapshots.io/snapshots/testnet/$(cat snapshot.json) \
+            | lz4 -c -d - | tar -x -C .
+        mv db/* .
+
 
     - name: ⚙️ Setup (get latest bins and configs and decode fixtures)
       run: rake setup[preprod,$BRANCH]
@@ -91,20 +99,20 @@ jobs:
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-macos-preprod
 
     - name: 💾 GH Save Cache of wallet db
       if: always()
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2e-macos-preprod
 
     - name: 📎 Upload state
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: ${{ runner.os }}-state
+        name: macos-state
         path: |
           test/e2e/state/logs
           test/e2e/state/configs
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
index ab3f8538f4d..9d55957291d 100644
--- a/.github/workflows/e2e-windows.yml
+++ b/.github/workflows/e2e-windows.yml
@@ -75,14 +75,14 @@ jobs:
       uses: actions/cache@v3
       with:
         path: C:/cardano-wallet/test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-windows-preprod
 
     - name: 💾 Cache wallet db
       id: cache-wallet
       uses: actions/cache@v3
       with:
         path: C:/cardano-wallet/test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2e-windows-preprod
 
     - name: Fetch preprod snapshot
       if: steps.cache-node.outputs.cache-hit != 'true'
@@ -94,8 +94,10 @@ jobs:
         cd node_db
         mkdir preprod
         cd preprod
-        curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json | jq -r .[].file_name > snapshot.json
-        curl -o snapshot.tar.lz4 https://downloads.csnapshots.io/snapshots/testnet/$(cat snapshot.json)
+        curl -s https://downloads.csnapshots.io/snapshots/testnet/testnet-db-snapshot.json \
+            | jq -r .[].file_name > snapshot.json
+        curl -o snapshot.tar.lz4 \
+            https://downloads.csnapshots.io/snapshots/testnet/$(cat snapshot.json)
         arc unarchive snapshot.tar.lz4
         mv db/* .
 
@@ -128,20 +130,20 @@ jobs:
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/node_db/preprod
-        key: node-db-${{ runner.os }}-preprod
+        key: node-db-e2e-windows-preprod
 
     - name: 💾 GH Save Cache of wallet db
       if: always()
       uses: actions/cache/save@v3
       with:
         path: test/e2e/state/wallet_db/preprod
-        key: wallet-db3-${{ runner.os }}-preprod
+        key: wallet-db-e2e-windows-preprod
 
     - name: 📎 Upload state
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: ${{ runner.os }}-state
+        name: windows-state
         path: |
           C:/cardano-wallet/test/e2e/state/logs
           C:/cardano-wallet/test/e2e/state/configs