diff --git a/bin/build.sh b/bin/build.sh
index e8f93228..5e8ed519 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -32,7 +32,7 @@ CLONE_FLAGS=(--depth=1 --single-branch)
 # Ustreamer repo
 USTREAMER_PATH="ustreamer"
 if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then
-    CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git"
+    CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/mryel00/ustreamer.git"
 fi
 if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then
     CROWSNEST_USTREAMER_REPO_BRANCH="master"
diff --git a/tools/configure.sh b/tools/configure.sh
index e0134cb6..8c3d9579 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -26,7 +26,7 @@ CN_CONFIG_CONFIGPATH="${CN_CONFIG_ROOTPATH}/config"
 CN_CONFIG_LOGPATH="${CN_CONFIG_ROOTPATH}/logs"
 CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd"
 CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf"
-CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git"
+CN_USTREAMER_REPO="https://github.com/mryel00/ustreamer.git"
 CN_USTREAMER_BRANCH="master"
 CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git"
 CN_CAMERA_STREAMER_BRANCH="master"
diff --git a/tools/libs/config.sh b/tools/libs/config.sh
index 35f3a29f..ba0b10b3 100755
--- a/tools/libs/config.sh
+++ b/tools/libs/config.sh
@@ -35,7 +35,7 @@ import_config() {
         [[ -n "${CROWSNEST_CONFIG_PATH}" ]] || CROWSNEST_CONFIG_PATH="/home/${BASE_USER}/printer_data/config"
         [[ -n "${CROWSNEST_LOG_PATH}" ]] || CROWSNEST_LOG_PATH="/home/${BASE_USER}/printer_data/logs"
         [[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd"
-        [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git"
+        [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/mryel00/ustreamer.git"
         [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="master"
         [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git"
         [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"