diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 1721e12e..05acb115 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -45,7 +45,7 @@ jobs:
           cache_packages: true
 
       - name: Compile Release
-        run: make linux_x86_64
+        run: make gcc-linux-amd64-release
 
       - name: CLI Artifacts
         if: ${{ inputs.build-cli }}
@@ -57,6 +57,5 @@ jobs:
           assets: |
             zanod
             simplewallet
-            connectivity_tool
           asset-type: 'cli'
-          asset-directory: ${{ github.workspace }}/build/linux_x86_64/src
+          asset-directory: ${{ github.workspace }}/build/gcc-linux-amd64-release/src
diff --git a/.github/workflows/build-macos-intel.yml b/.github/workflows/build-macos-intel.yml
index 244d0945..bf915ede 100644
--- a/.github/workflows/build-macos-intel.yml
+++ b/.github/workflows/build-macos-intel.yml
@@ -45,7 +45,7 @@ jobs:
           cache_packages: true
 
       - name: Compile Release
-        run: make mac_intel
+        run: make apple-clang-arm64-release
 
       - name: CLI Artifacts
         if: ${{ inputs.build-cli }}
@@ -57,6 +57,5 @@ jobs:
           assets: |
             zanod
             simplewallet
-            connectivity_tool
           asset-type: 'cli'
-          asset-directory: ${{ github.workspace }}/build/mac_intel/src
+          asset-directory: ${{ github.workspace }}/build/apple-clang-arm64-release/src
diff --git a/Makefile b/Makefile
index 0488527f..e29830f2 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ $(PROFILES): conan-profile-detect
 	@echo "Building profile: $@"
 	CONAN_HOME=$(CONAN_CACHE) conan install . --output-folder=build/$@ --profile=cmake/profiles/$@ --build=missing
 	cmake -S . -B build/$@ -DCMAKE_TOOLCHAIN_FILE=build/$@/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
-	cmake --build build/$@ --config=Release --parallel=2
+	cmake --build build/$@ --config=Release --parallel=20
 
 help:
 	@echo "Available targets:"
diff --git a/cmake/profiles/android b/cmake/profiles/android
deleted file mode 100644
index a56c56d0..00000000
--- a/cmake/profiles/android
+++ /dev/null
@@ -1,11 +0,0 @@
-[settings]
-os=Android
-os.api_level=21
-arch=armv8
-compiler=clang
-compiler.version=11
-compiler.libcxx=c++_static
-build_type=Release
-
-[conf]
-tools.cmake.cmaketoolchain:user_presets=False
diff --git a/cmake/profiles/mac_intel b/cmake/profiles/apple-clang-amd64-release
similarity index 100%
rename from cmake/profiles/mac_intel
rename to cmake/profiles/apple-clang-amd64-release
diff --git a/cmake/profiles/mac_arm b/cmake/profiles/apple-clang-arm64-release
similarity index 100%
rename from cmake/profiles/mac_arm
rename to cmake/profiles/apple-clang-arm64-release
diff --git a/cmake/profiles/linux_x86_64 b/cmake/profiles/gcc-linux-amd64-release
similarity index 100%
rename from cmake/profiles/linux_x86_64
rename to cmake/profiles/gcc-linux-amd64-release
diff --git a/cmake/profiles/ios b/cmake/profiles/ios
deleted file mode 100644
index 3cfc4891..00000000
--- a/cmake/profiles/ios
+++ /dev/null
@@ -1,11 +0,0 @@
-[settings]
-os=iOS
-os.version=15.0
-arch=armv8
-compiler=apple-clang
-compiler.version=13
-compiler.libcxx=libc++
-build_type=Release
-
-[conf]
-tools.cmake.cmaketoolchain:user_presets=False
diff --git a/cmake/profiles/win_x86_64_msvc b/cmake/profiles/msvc-194-amd64
similarity index 100%
rename from cmake/profiles/win_x86_64_msvc
rename to cmake/profiles/msvc-194-amd64
diff --git a/cmake/profiles/win_x86_64_mingw b/cmake/profiles/win_x86_64_mingw
deleted file mode 100644
index ec7f969e..00000000
--- a/cmake/profiles/win_x86_64_mingw
+++ /dev/null
@@ -1,17 +0,0 @@
-[settings]
-os=Windows
-arch=x86_64
-compiler=gcc
-compiler.version=12
-compiler.libcxx=libstdc++11
-build_type=Release
-
-[options]
-# Example: boost:without_test=True
-
-[env]
-CC=x86_64-w64-mingw32-gcc
-CXX=x86_64-w64-mingw32-g++
-
-[conf]
-tools.cmake.cmaketoolchain:user_presets=False