--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -27,6 +27,7 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
+
 # ===== BUILD current version ======
 FROM rust-builder as builder-unique-current
 
@@ -45,8 +46,6 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG BRANCH=
-ARG REPO_URL=
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
--- a/.github/workflows/nodes-only-update.yml
+++ b/.github/workflows/nodes-only-update.yml
@@ -142,7 +142,7 @@
           node-version: 16
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
+        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300
 
       #  🚀 POLKADOT LAUNCH COMPLETE 🚀
       - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
@@ -191,8 +191,8 @@
         shell: bash
 
       - name: Run tests before Node Parachain upgrade
+        working-directory: tests
         run: |
-          cd tests
           yarn install
           yarn add mochawesome
           echo "Ready to start tests"
@@ -211,7 +211,7 @@
           fail-on-error: 'false'
 
       - name: Send SIGUSR1 to polkadotlaunch process
-        if: success()
+        if: success() || failure()
         run: |
           #Get PID of polkadot-launch
           PID=$(docker exec node-parachain pidof 'polkadot-launch')
@@ -266,8 +266,8 @@
         shell: bash
 
       - name: Run tests after Node Parachain upgrade
+        working-directory: tests
         run: |
-          cd tests
           yarn install
           yarn add mochawesome
           echo "Ready to start tests"
@@ -288,9 +288,14 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down
+        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
 
-        #docker-compose rm -f
-      - name: Remove Docker build artefacts
+      - name: Remove builder cache
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" rm -f
+        run: |
+          docker builder prune -f
+          docker system prune -f
+
+      - name: Clean Workspace
+        if: always()
+        uses: AutoModality/action-clean@v1.1.0