diff --git a/BuildLinux.sh b/BuildLinux.sh
index c8c07980..647b0d62 100755
--- a/BuildLinux.sh
+++ b/BuildLinux.sh
@@ -86,6 +86,7 @@ if [ "${BUILD_DEBUG}" = "1" ]; then
     fi
 fi
 INTERNAL_TESTING=${INTERNAL_TESTING:-0}
+QDT_RELEASE_TO_PUBLIC=${QDT_RELEASE_TO_PUBLIC:-1}
 
 if [ ${OPTIND} -eq 1 ]
 then
@@ -189,9 +190,9 @@ then
     fi
     if [[ -n "${BUILD_DEBUG}" ]]
     then
-        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DQDT_INTERNAL_TESTING=${INTERNAL_TESTING}"
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DQDT_RELEASE_TO_PUBLIC=${QDT_RELEASE_TO_PUBLIC} -DQDT_INTERNAL_TESTING=${INTERNAL_TESTING}"
     else
-        BUILD_ARGS="${BUILD_ARGS} -DQDT_RELEASE_TO_PUBLIC=1 -DQDT_INTERNAL_TESTING=${INTERNAL_TESTING}"
+        BUILD_ARGS="${BUILD_ARGS} -DQDT_RELEASE_TO_PUBLIC=${QDT_RELEASE_TO_PUBLIC} -DQDT_INTERNAL_TESTING=${INTERNAL_TESTING}"
     fi
     echo -e "cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}"
     cmake -S . -B build -G Ninja \
diff --git a/DockerBuild.sh b/DockerBuild.sh
index 241c8716..7bee6826 100755
--- a/DockerBuild.sh
+++ b/DockerBuild.sh
@@ -10,13 +10,14 @@ function usage() {
     echo "   -i: Build and export an AppImage"
     echo "   -v: Build System Version:ubu22 or ubu24"
     echo "   -b: Build beta version (internal testing=2)"
+    echo "   -n: Build without QIDI's proprietary cloud layer (auto-detected by default)."
     echo "   -h: this help output"
     echo "If you only need to run the program on a built Docker container, just use './DockerBuild.sh -c'"
     echo "If you need to build an AppImage using Docker, first run './DockerBuild.sh -d', then run './DockerBuild.sh -i'."
 }
 
 unset name
-while getopts "hcdibv:" opt; do
+while getopts "hcdibnv:" opt; do
   case ${opt} in
     c )
         BUILD_RUNNER=1
@@ -30,6 +31,9 @@ while getopts "hcdibv:" opt; do
     b )
         BUILD_BETA="--build-arg INTERNAL_TESTING=2"
         ;;
+    n )
+        BUILD_NO_CLOUD="--build-arg QDT_RELEASE_TO_PUBLIC=0"
+        ;;
     v )
         SYSTEM_VERSION="$OPTARG"
         ;;
@@ -54,10 +58,10 @@ fi
 
 if [[ -n "${BUILD_APPIMAGE}" ]]; then
   if [ "$SYSTEM_VERSION" == "ubu22" ]; then
-    docker build -f docker/BuildAppimageDockerfile --build-arg VERSION=studio_dep_22 ${BUILD_BETA} -o type=local,dest=./build .
+    docker build -f docker/BuildAppimageDockerfile --build-arg VERSION=studio_dep_22 ${BUILD_BETA} ${BUILD_NO_CLOUD} -o type=local,dest=./build .
     mv build/QIDIStudio_ubu64.AppImage build/QIDIStudio_ubu22.AppImage
   else
-    docker build -f docker/BuildAppimageDockerfile --build-arg VERSION=studio_dep_24 ${BUILD_BETA} -o type=local,dest=./build .
+    docker build -f docker/BuildAppimageDockerfile --build-arg VERSION=studio_dep_24 ${BUILD_BETA} ${BUILD_NO_CLOUD} -o type=local,dest=./build .
     mv build/QIDIStudio_ubu64.AppImage build/QIDIStudio_ubu24.AppImage
   fi
 fi
@@ -74,4 +78,4 @@ then
     --build-arg UID=$(id -u) \
     --build-arg GID=$(id -g) \
     $PROJECT_ROOT
-fi
\ No newline at end of file
+fi
diff --git a/docker/BuildAppimageDockerfile b/docker/BuildAppimageDockerfile
index ac708fd5..68e5fc22 100644
--- a/docker/BuildAppimageDockerfile
+++ b/docker/BuildAppimageDockerfile
@@ -4,6 +4,9 @@ FROM ${VERSION}:1.0 AS builder
 
 ARG INTERNAL_TESTING="0"
 
+ARG QDT_RELEASE_TO_PUBLIC="1"
+ENV QDT_RELEASE_TO_PUBLIC=${QDT_RELEASE_TO_PUBLIC}
+
 COPY ./ /QIDIStudio
 
 WORKDIR /QIDIStudio
@@ -19,4 +22,4 @@ RUN ./BuildLinux.sh -i
 
 FROM scratch AS export-stage
 
-COPY --from=builder /QIDIStudio/build/QIDIStudio_ubu64.AppImage /
\ No newline at end of file
+COPY --from=builder /QIDIStudio/build/QIDIStudio_ubu64.AppImage /
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index f1f5aba1..c97d191d 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -241,8 +241,6 @@ set(SLIC3R_GUI_SOURCES
     GUI/DownloadManager.hpp
     GUI/QDSDeviceManager.cpp
     GUI/QDSDeviceManager.hpp
-    QIDI/UserPresetSyncManager.cpp
-    QIDI/UserPresetSyncManager.hpp
     GUI/BedShapeDialog.cpp
     GUI/BedShapeDialog.hpp
     GUI/Plater.cpp
@@ -683,6 +681,8 @@ if(QDT_RELEASE_TO_PUBLIC)
 			QIDI/QIDISSEClientV2.hpp
             QIDI/P2PManager.cpp
 		    QIDI/P2PManager.hpp
+		    QIDI/UserPresetSyncManager.cpp
+		    QIDI/UserPresetSyncManager.hpp
 		)
 endif ()
 
diff --git a/version.inc b/version.inc
index 6d955696..a58fe515 100644
--- a/version.inc
+++ b/version.inc
@@ -7,6 +7,10 @@ set(SLIC3R_APP_KEY "QIDIStudio")
 if(NOT DEFINED QDT_RELEASE_TO_PUBLIC)
 set(QDT_RELEASE_TO_PUBLIC "1")
 endif()
+if(QDT_RELEASE_TO_PUBLIC AND NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/src/slic3r/QIDI/QIDINetwork.cpp")
+    message(WARNING "src/slic3r/QIDI/ is missing: building without QIDI cloud/account features.")
+    set(QDT_RELEASE_TO_PUBLIC "0")
+endif()
 if(NOT DEFINED QDT_INTERNAL_TESTING)
 set(QDT_INTERNAL_TESTING "0")
 endif()
@@ -16,4 +20,4 @@ endif()
 set(SLIC3R_VERSION "02.07.02.60")
 
 string(REPLACE "." "," SLIC3R_COMMA_SEPARATED_VERSION ${SLIC3R_VERSION})
-set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}")
\ No newline at end of file
+set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}")