--- a/.docker/docker-compose-dev.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.5"
-
-services:
-  node-dev:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-chain-dev
-    image: node-dev
-    container_name: node-dev
--- a/.docker/docker-compose-forkless.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3.5"
-
-services:
-  node-parachain:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-parachain-upgrade
-    image: node-parachain
-    container_name: node-parachain
-    volumes:
-       - type: bind
-         source: ./launch-config-forkless.json
-         target: /polkadot-launch/launch-config.json
-         read_only: true
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
--- a/.docker/docker-compose-master.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.5"
-
-services:
-  blockchain_nodes:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-parachain
-    image: blockchain_nodes
-    container_name: blockchain_nodes
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
--- a/.docker/docker-compose-try-runtime.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.5"
-
-services:
-  try-runtime:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-try-runtime
-    image: try-runtime
-    container_name: try-runtime
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -8,6 +8,8 @@
         - "NETWORK={{ NETWORK }}"
       context: ../
       dockerfile: .docker/Dockerfile-chain-dev
+    image: node-dev
+    container_name: node-dev
     expose:
       - 9944
       - 9933
--- a/.docker/docker-compose.tmp-master.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-version: "3.5"
-
-services:
-  blockchain_nodes:
-    build:
-      args:
-        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "BRANCH={{ BRANCH }}"
-        - "REPO_URL={{ REPO_URL }}"
-        - "NETWORK={{ NETWORK }}"
-        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
--- /dev/null
+++ b/.docker/docker-compose.tmp-try-runtime.j2
@@ -0,0 +1,23 @@
+version: "3.5"
+
+services:
+  try-runtime:
+    build:
+      context: ../
+      dockerfile: .docker/Dockerfile-try-runtime
+      args:
+        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+        - "NETWORK={{ NETWORK }}"
+        - "REPLICA_FROM={{ REPLICA_FROM }}"      
+    image: try-runtime
+    container_name: try-runtime
+    expose:
+      - 9944
+      - 9933
+    ports:
+      - 127.0.0.1:9944:9944
+      - 127.0.0.1:9933:9933
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
--- a/.docker/docker-compose.tmp-unit.j2
+++ b/.docker/docker-compose.tmp-unit.j2
@@ -8,6 +8,8 @@
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "NETWORK={{ NETWORK }}"
+    image: node-dev
+    container_name: node-dev        
     logging:
       options:
         max-size: "1m"
--- a/.docker/docker-compose.try-runtime.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-version: "3.5"
-
-services:
-  try-runtime:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-try-runtime
-      args:
-        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "NETWORK={{ NETWORK }}"
-        - "REPLICA_FROM={{ REPLICA_FROM }}"      
-    image: try-runtime
-    container_name: try-runtime
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -41,7 +41,7 @@
       - name: Generate ENV related extend file for docker-compose
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: .docker/docker-compose.try-runtime.j2
+          template: .docker/docker-compose.tmp-try-runtime.j2
           output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -46,11 +46,11 @@
         run: cat .docker/docker-compose.unit.yml
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" up --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev
+        run: docker-compose -f ".docker/docker-compose.unit.yml" up --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" down
+        run: docker-compose -f ".docker/docker-compose.unit.yml" down
         
       - name: Remove builder cache
         if: always()                   # run this step always
--- a/.github/workflows/yarn-dev.yml
+++ b/.github/workflows/yarn-dev.yml
@@ -54,7 +54,7 @@
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans
+        run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans
 
       - uses: actions/setup-node@v3
         with:
@@ -88,7 +88,7 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
+        run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" down
 
       - name: Remove builder cache
         if: always()                   # run this step always