diff --git a/.github/workflows/qa-clean-exit-block-downloading.yml b/.github/workflows/qa-clean-exit-block-downloading.yml
index e3f09a89b82..df5115203c3 100644
--- a/.github/workflows/qa-clean-exit-block-downloading.yml
+++ b/.github/workflows/qa-clean-exit-block-downloading.yml
@@ -24,11 +24,6 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-
     - name: Clean Erigon Build Directory
       run: |
         make clean
@@ -44,7 +39,6 @@ jobs:
 
     - name: Restore Erigon Testbed Data Directory
       run: |
-        rm -rf $ERIGON_TESTBED_DATA_DIR/chaindata
         rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
 
     - name: Run Erigon, send ctrl-c and check for clean exiting
@@ -76,6 +70,10 @@ jobs:
           echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
         fi
 
+    - name: Delete Erigon Testbed Data Directory
+      run: |
+        rm -rf $ERIGON_TESTBED_DATA_DIR
+
     - name: Resume the Erigon instance dedicated to db maintenance
       run: |
         python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true
diff --git a/.github/workflows/qa-clean-exit-snapshot-downloading.yml b/.github/workflows/qa-clean-exit-snapshot-downloading.yml
index 2a3999bc016..258032a6428 100644
--- a/.github/workflows/qa-clean-exit-snapshot-downloading.yml
+++ b/.github/workflows/qa-clean-exit-snapshot-downloading.yml
@@ -24,11 +24,6 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-
     - name: Clean Erigon Build Directory
       run: |
         make clean
diff --git a/.github/workflows/qa-snap-download.yml b/.github/workflows/qa-snap-download.yml
index 51a88d41e61..7cdc94d3fb1 100644
--- a/.github/workflows/qa-snap-download.yml
+++ b/.github/workflows/qa-snap-download.yml
@@ -18,11 +18,6 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-
     - name: Clean Erigon Build Directory
       run: |
         make clean
diff --git a/.github/workflows/qa-tip-tracking.yml b/.github/workflows/qa-tip-tracking.yml
index c7a8cd6d94f..587242ff6e8 100644
--- a/.github/workflows/qa-tip-tracking.yml
+++ b/.github/workflows/qa-tip-tracking.yml
@@ -18,11 +18,6 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-
     - name: Clean Erigon Build Directory
       run: |
         make clean
@@ -38,7 +33,6 @@ jobs:
 
     - name: Restore Erigon Testbed Data Directory
       run: |
-        rm -rf $ERIGON_TESTBED_DATA_DIR/chaindata
         rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
 
     - name: Run Erigon, wait sync and check ability to maintain sync
@@ -72,6 +66,10 @@ jobs:
           echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
         fi
 
+    - name: Delete Erigon Testbed Data Directory
+      run: |
+        rm -rf $ERIGON_TESTBED_DATA_DIR
+
     - name: Resume the Erigon instance dedicated to db maintenance
       run: |
         python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true