diff --git a/Dockerfile b/Dockerfile
index 1bf53d7..a435d81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,7 @@ RUN apt-get update \
          doxygen liblog4cpp5-dev python3-scipy python3-numpy \
          libvolk-dev libfftw3-dev build-essential \
        && cd /tmp \
-       && git clone --depth 1 https://github.com/ptrkrysik/gr-gsm.git \
+       && git clone --depth 1 https://github.com/bkerler/gr-gsm.git \
        && cd gr-gsm \
        && mkdir build && cd build \
        && cmake .. \
diff --git a/routes/gsm_spy.py b/routes/gsm_spy.py
index cba68fd..524033f 100644
--- a/routes/gsm_spy.py
+++ b/routes/gsm_spy.py
@@ -1379,7 +1379,7 @@ def scanner_thread(cmd, device_index):
             except FileNotFoundError:
                 logger.error(
                     "grgsm_scanner not found. Please install gr-gsm: "
-                    "https://github.com/ptrkrysik/gr-gsm"
+                    "https://github.com/bkerler/gr-gsm"
                 )
                 # Send error to SSE stream so the UI knows
                 try:
diff --git a/setup.sh b/setup.sh
index 608be9c..f41218a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -724,7 +724,7 @@ install_macos_packages() {
         trap 'rm -rf "$tmp_dir"' EXIT
 
         info "Cloning gr-gsm repository..."
-        git clone --depth 1 https://github.com/ptrkrysik/gr-gsm.git "$tmp_dir/gr-gsm" >/dev/null 2>&1 \
+        git clone --depth 1 https://github.com/bkerler/gr-gsm.git "$tmp_dir/gr-gsm" >/dev/null 2>&1 \
           || { warn "Failed to clone gr-gsm. GSM Spy feature will not work."; exit 1; }
 
         cd "$tmp_dir/gr-gsm"
@@ -1182,7 +1182,7 @@ install_debian_packages() {
         rm -rf /tmp/gr-gsm
       fi
 
-      git clone https://github.com/ptrkrysik/gr-gsm.git /tmp/gr-gsm || {
+      git clone https://github.com/bkerler/gr-gsm.git /tmp/gr-gsm || {
         warn "Failed to clone gr-gsm repository. GSM Spy will not be available."
         return 0
       }
diff --git a/utils/dependencies.py b/utils/dependencies.py
index 144771f..e6a1bee 100644
--- a/utils/dependencies.py
+++ b/utils/dependencies.py
@@ -451,9 +451,9 @@ TOOL_DEPENDENCIES = {
                 'required': True,
                 'description': 'gr-gsm scanner for finding GSM towers',
                 'install': {
-                    'apt': 'Build gr-gsm from source: https://github.com/ptrkrysik/gr-gsm',
+                    'apt': 'Build gr-gsm from source: https://github.com/bkerler/gr-gsm',
                     'brew': 'brew install gr-gsm (may require manual build)',
-                    'manual': 'https://github.com/ptrkrysik/gr-gsm'
+                    'manual': 'https://github.com/bkerler/gr-gsm'
                 }
             },
             'grgsm_livemon': {