diff --git a/.github/workflows/dockerarm.yml b/.github/workflows/dockerarm.yml
index 55cb402..e3719ec 100644
--- a/.github/workflows/dockerarm.yml
+++ b/.github/workflows/dockerarm.yml
@@ -8,6 +8,6 @@ jobs:
       - name: Register self-compiled qemu
         run: docker run --rm --privileged meedamian/simple-qemu-test:minimal --reset -p yes
       - name: Start building the Docker image (1st part)
-        run: docker images && docker build  -t partial-bitcoind-arm  -f 0.18/source/Dockerfile  .
+        run: docker images && docker build  -t partial-bitcoind-arm  -f 0.18/source/Dockerfile  0.18/
       - name: Complete the Docker image (2snd part)
-        run: docker images && docker build  -t bitcoind-arm  -f 0.18/source/Dockerfile.part2  .
+        run: docker images && docker build  -t bitcoind-arm  -f 0.18/source/Dockerfile.part2  0.18/
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 1a87692..a82ddcf 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -6,6 +6,6 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Start building the Docker image (1st part)
-        run: docker images && docker build  -t partial-bitcoind-amd64  -f 0.18/source-native/Dockerfile  .
+        run: docker images && docker build  -t partial-bitcoind-amd64  -f 0.18/source-native/Dockerfile  0.18/
       - name: Complete the Docker image (2snd part)
-        run: docker images && docker build   -t bitcoind-amd64  -f 0.18/source-native/Dockerfile.part2  .
+        run: docker images && docker build   -t bitcoind-amd64  -f 0.18/source-native/Dockerfile.part2  0.18/
diff --git a/0.18/source-native/skip-fs-test-of-utf8.patch b/0.18/skip-fs-test-of-utf8.patch
similarity index 100%
rename from 0.18/source-native/skip-fs-test-of-utf8.patch
rename to 0.18/skip-fs-test-of-utf8.patch
diff --git a/0.18/source/skip-fs-test-of-utf8.patch b/0.18/source/skip-fs-test-of-utf8.patch
deleted file mode 100644
index 9d3790c..0000000
--- a/0.18/source/skip-fs-test-of-utf8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/test/fs_tests.cpp src/test/fs_tests.cpp
-index 93aee10bb..4a01e2ed8 100644
---- src/test/fs_tests.cpp
-+++ src/test/fs_tests.cpp
-@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(fsbridge_fstream)
-     fs::path tmpfolder = SetDataDir("fsbridge_fstream");
-     // tmpfile1 should be the same as tmpfile2
-     fs::path tmpfile1 = tmpfolder / "fs_tests_₿_🏃";
--    fs::path tmpfile2 = tmpfolder / L"fs_tests_₿_🏃";
-+    fs::path tmpfile2 = tmpfolder / "fs_tests_₿_🏃";
-     {
-         fsbridge::ofstream file(tmpfile1);
-         file << "bitcoin";