diff --git a/.github/workflows/build-nmap.yml b/.github/workflows/build-nmap.yml
index 93e1188..bd6832d 100644
--- a/.github/workflows/build-nmap.yml
+++ b/.github/workflows/build-nmap.yml
@@ -145,12 +145,15 @@ jobs:
           run: ls -laR /tmp/releases
 
         - name: Tag Release
+          id: tag_release
           run: |
             set +e
-            if git rev-list "nmap-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then
+            git fetch --quiet --prune --tags
+            if [[ $(git tag -l | grep nmap-v${{ needs.build-x86.outputs.version }} | wc -l) -gt 0 ]]; then
               echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
               echo ::set-output name=NEW_RELEASE::"false"
             else
+              echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} missing. Starting release creation."
               git tag "nmap-v${{ needs.build-x86.outputs.version }}"
               git push origin "nmap-v${{ needs.build-x86.outputs.version }}"
               echo ::set-output name=NEW_RELEASE::"true"
diff --git a/README.md b/README.md
index c9666c4..fff326a 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ The following table shows the building status for the current toolset. The follo
 
 | Tool | Status |
 | ---- | ------ |
-|[Nmap](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22Nmap%22)|![Nmap](https://github.com/ernw/static-toolbox/workflows/Nmap/badge.svg)|
-|[OpenSSH](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22OpenSSH%22)|![OpenSSH](https://github.com/ernw/static-toolbox/workflows/OpenSSH/badge.svg)|
-|[socat](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22socat%22)|![socat](https://github.com/ernw/static-toolbox/workflows/socat/badge.svg)|
-|[GDB & gdbserver](https://github.com/ernw/static-toolbox/actions?query=workflow%3AGDB)|![GDB & gdbserver](https://github.com/ernw/static-toolbox/workflows/GDB%20&%20gdbserver/badge.svg)|
-|[tcpdump](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22tcpdump%22)|![tcpdump](https://github.com/ernw/static-toolbox/workflows/tcpdump/badge.svg)|
+|[Nmap](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22Nmap%22)|![Nmap](https://github.com/takeshixx/static-toolbox/workflows/Nmap/badge.svg)|
+|[OpenSSH](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22OpenSSH%22)|![OpenSSH](https://github.com/takeshixx/static-toolbox/workflows/OpenSSH/badge.svg)|
+|[socat](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22socat%22)|![socat](https://github.com/takeshixx/static-toolbox/workflows/socat/badge.svg)|
+|[GDB & gdbserver](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3AGDB)|![GDB & gdbserver](https://github.com/takeshixx/static-toolbox/workflows/GDB%20&%20gdbserver/badge.svg)|
+|[tcpdump](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22tcpdump%22)|![tcpdump](https://github.com/takeshixx/static-toolbox/workflows/tcpdump/badge.svg)|
 
diff --git a/build/02_install_build_compiler.sh b/build/02_install_build_compiler.sh
index 15cb8c3..bb70c9e 100755
--- a/build/02_install_build_compiler.sh
+++ b/build/02_install_build_compiler.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
+
+function die(){
+    echo "$1"
+    exit 1
+}
+
 if [ $# -ne 1 ];then
     echo "Missing arch"
     exit 1
 fi
-ARCH="${1,,}"
+ARCH="${1}"
 case $ARCH in
     x86_64|i686|aarch64)
         ARCH="${ARCH}-linux-musl"
@@ -20,7 +26,8 @@ case $ARCH in
         ;;
 esac
 HOST=http://musl.cc
+echo "Fetching ${HOST}/${ARCH}-cross.tgz"
 cd /
-curl -so ${ARCH}-cross.tgz ${HOST}/${ARCH}-cross.tgz
-tar -xf ${ARCH}-cross.tgz 
-rm ${ARCH}-cross.tgz
\ No newline at end of file
+curl -so ${ARCH}-cross.tgz ${HOST}/${ARCH}-cross.tgz || die "Failed to download build compiler package"
+tar -xf ${ARCH}-cross.tgz || die "Failed to extract build compiler package"
+rm ${ARCH}-cross.tgz || die "Failed to remove build compiler package"
\ No newline at end of file
diff --git a/build/targets/build_gdb.sh b/build/targets/build_gdb.sh
index 916d74b..2d00027 100755
--- a/build/targets/build_gdb.sh
+++ b/build/targets/build_gdb.sh
@@ -18,8 +18,7 @@ build_gdb() {
     fetch "$GIT_BINUTILS_GDB" "${BUILD_DIRECTORY}/binutils-gdb" git
     cd "${BUILD_DIRECTORY}/binutils-gdb/" || { echo "Cannot cd to ${BUILD_DIRECTORY}/binutils-gdb/"; exit 1; }
     git clean -fdx
-    git checkout gdb-10.1-release
-
+    git checkout gdb-12.1-release
     CMD="CFLAGS=\"${GCC_OPTS}\" "
     CMD+="CXXFLAGS=\"${GXX_OPTS}\" "
     CMD+="LDFLAGS=\"-static\" "
diff --git a/build/targets/build_openssh.sh b/build/targets/build_openssh.sh
index e9ba48e..f8cebee 100755
--- a/build/targets/build_openssh.sh
+++ b/build/targets/build_openssh.sh
@@ -17,7 +17,7 @@ init_lib $1
 build_openssh() {
     fetch "https://github.com/openssh/openssh-portable.git" "${BUILD_DIRECTORY}/openssh-portable" git
     cd "${BUILD_DIRECTORY}/openssh-portable"
-    git checkout V_8_6_P1
+    git checkout V_9_1_P1
     git clean -fdx
     autoreconf -i
     CC="gcc ${GCC_OPTS}" \