diff --git a/.gitmodules b/.gitmodules
index 02c761a7f0a9dbf9e8b0d05051f751857a31e0e6..185d8be6f8cc31b43bd385e5dbb0bd82df344cfd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://0xacab.org/leap/obfsvpn.git
 [submodule "motd"]
 	path = motd
-	url = git@0xacab.org:leap/motd.git
+	url = https://0xacab.org/leap/motd.git
diff --git a/build_core.sh b/build_core.sh
index 36ac113ea8b762ba0c9b57e3ed5a9807ae38d335..116f0054c33d18fd24ff969399c255c3fc8f7a4a 100755
--- a/build_core.sh
+++ b/build_core.sh
@@ -21,8 +21,14 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
         EXPECTED_FP=87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd
 elif [[ "$OSTYPE" == "darwin"* ]]; then
         # Mac OSX
-        GO_VERSION=go1.17.10.darwin-arm64
-        EXPECTED_FP=84979d5985c70cee6f303050a7e811440aad7f304efdf28665b200f096b01945
+        ARCH=`uname -a | rev | cut -d " " -f 1 | rev`
+        if [[ "$ARCH" = "x86_64" ]]; then
+            GO_VERSION=go1.17.10.darwin-amd64
+            EXPECTED_FP=84979d5985c70cee6f303050a7e811440aad7f304efdf28665b200f096b01945
+        else
+            GO_VERSION=go1.17.10.darwin-arm64
+            EXPECTED_FP=32098bea40117ea1ec23e7124cd188db6bdddd0ea41e2ec9bea3ba35a487e39c
+        fi
 else
         echo "$OSTYPE is currently not supported."
         exit 1
@@ -38,7 +44,7 @@ else
     if [[ "$OSTYPE" == "linux-gnu"* ]]; then
       ACTUAL_FP=`sha256sum $GO_VERSION.tar.gz | cut -d " " -f1`
     else
-      ACTUAL_FP=`shasum -a 512256 $GO_VERSION.tar.gz | cut -d " " -f1`
+      ACTUAL_FP=`shasum -a 256 $GO_VERSION.tar.gz | cut -d " " -f1`
     fi
 
     if [[ ! $ACTUAL_FP == $EXPECTED_FP ]]
diff --git a/shapeshifter b/shapeshifter
index d3d699aae868bae11cda9d896af460536ad2bb19..de6cd3602e5b52cf0799ea81bde0eb58fe09d621 160000
--- a/shapeshifter
+++ b/shapeshifter
@@ -1 +1 @@
-Subproject commit d3d699aae868bae11cda9d896af460536ad2bb19
+Subproject commit de6cd3602e5b52cf0799ea81bde0eb58fe09d621