diff --git a/.github/mining-test/bitcoind01.conf b/.github/mining-test/bitcoind01/bitcoind.conf
similarity index 100%
rename from .github/mining-test/bitcoind01.conf
rename to .github/mining-test/bitcoind01/bitcoind.conf
diff --git a/.github/mining-test/bitcoind02.conf b/.github/mining-test/bitcoind02/bitcoind.conf
similarity index 100%
rename from .github/mining-test/bitcoind02.conf
rename to .github/mining-test/bitcoind02/bitcoind.conf
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9d0849101d8..b4e4e0a0e9a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -167,29 +167,54 @@ jobs:
       bitcoind01:
         image: kylemanna/bitcoind:latest
         volumes:
-          - ${{ github.workspace }}/.github/mining-test/bitcoind01.conf:/etc/bitcoind/bitcoind.conf
+          - ${{ github.workspace }}/.github/mining-test/bitcoind01:/bitcoin/.bitcoin/
         env:
           DISABLEWALLET: "0"
         ports:
           - 31591:31591
+          - 32591:32591
         options: >-
           --entrypoint "/usr/local/bin/bitcoind"
-          --conf "/etc/bitcoind/bitcoind.conf"
+          --name bitcoind01
       
 
       bitcoind02:
         image: kylemanna/bitcoind:latest
         volumes:
-          - ${{ github.workspace }}/.github/mining-test/bitcoind02.conf:/etc/bitcoind/bitcoind.conf
+          - ${{ github.workspace }}/.github/mining-test/bitcoind02:/bitcoin/.bitcoin/
         env:
           DISABLEWALLET: "0"
         ports:
           - 31592:31592
+          - 32592:32592
         options: >-
           --entrypoint "/usr/local/bin/bitcoind"
-          --conf "/etc/bitcoind/bitcoind.conf"
+          --name bitcoind02
+
     steps:
       - uses: actions/checkout@v2
+
+      - name: Check that bitcoind01 and bitcoind02 directories contain bitcoind.conf
+        run: |
+          pwd
+          ls -la .github/mining-test/bitcoind01
+          ls -la .github/mining-test/bitcoind02
+#          sudo cp -R ${{ github.workspace }}/.github/mining-test/bitcoind01/bitcoind.conf ${{ github.workspace }}/.test
+
+      - name: Restart bitcoin nodes
+        uses: docker://docker
+        with:
+          args: docker restart bitcoind01 bitcoind02
+
+      - name: Test bitcoin nodes
+        run: |
+          echo Test bitcoin node 1
+          curl -s -u admin:admin --data-binary '{"jsonrpc":"1.0","id":"curltext","method":"getblockchaininfo","params":[]}' -H 'content-type:text/plain;' http://bitcoind01:32591
+          echo Test bitcoin node 2
+          curl -s -u admin:admin --data-binary '{"jsonrpc":"1.0","id":"curltext","method":"getblockchaininfo","params":[]}' -H 'content-type:text/plain;' http://bitcoind01:32592
+      
+      
+
       - name: Setup System Tools
         run: |
           apt-get update -y
@@ -234,18 +259,6 @@ jobs:
 #
 #
 
-      - name: Restart bitcoin nodes
-        uses: docker://docker
-        with:
-          args: docker restart bitcoind01 bitcoind02
-
-      - name: Test bitcoin nodes
-        run: |
-          echo Test bitcoin node 1
-          curl -s -u admin:admin --data-binary '{"jsonrpc":"1.0","id":"curltext","method":"getblockchaininfo","params":[]}' -H 'content-type:text/plain;' http://bitcoind01:32591
-          echo Test bitcoin node 2
-          curl -s -u admin:admin --data-binary '{"jsonrpc":"1.0","id":"curltext","method":"getblockchaininfo","params":[]}' -H 'content-type:text/plain;' http://localhost:32592
-
       - name: Generate BTC blocks
         working-directory: mining-integration-tests
         run: |