diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh
index a48db9c25..65c31684e 100755
--- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh
+++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh
@@ -39,6 +39,7 @@ Build groups:
   --group3 / --no-group3   Enable/disable remaining application targets build
   --group4 / --no-group4   Enable/disable Lts/Proxies module targets and tests only
   --group5 / --no-group5   Enable/disable Lts/Viewer module targets and tests only
+  --build-viewer-only      Build only Viewer module targets (skip Groups 1-4, implies --group5 --no-ctest)
 
 Test execution:
   --no-ctest               Skip ctest execution
@@ -410,6 +411,7 @@ BUILD_GROUP2="${BUILD_GROUP2:-ON}"
 BUILD_GROUP3="${BUILD_GROUP3:-ON}"
 BUILD_GROUP4="${BUILD_GROUP4:-OFF}"
 BUILD_GROUP5="${BUILD_GROUP5:-OFF}"
+BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}"
 RUN_CTEST="${RUN_CTEST:-ON}"
 TESTS_ONLY="${TESTS_ONLY:-OFF}"
 INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
@@ -468,6 +470,11 @@ while [[ $# -gt 0 ]]; do
     --no-group5)
       BUILD_GROUP5=OFF
       ;;
+    --build-viewer-only)
+      BUILD_VIEWER_ONLY=ON
+      BUILD_GROUP5=ON
+      RUN_CTEST=ON
+      ;;
     --grantlee)
       BUILD_GRANTLEE=ON
       ;;
@@ -539,6 +546,7 @@ BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")"
 BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")"
 BUILD_GROUP4="$(normalize_on_off "$BUILD_GROUP4" "BUILD_GROUP4")"
 BUILD_GROUP5="$(normalize_on_off "$BUILD_GROUP5" "BUILD_GROUP5")"
+BUILD_VIEWER_ONLY="$(normalize_on_off "$BUILD_VIEWER_ONLY" "BUILD_VIEWER_ONLY")"
 RUN_CTEST="$(normalize_on_off "$RUN_CTEST" "RUN_CTEST")"
 TESTS_ONLY="$(normalize_on_off "$TESTS_ONLY" "TESTS_ONLY")"
 INTEGRATION_TEST="$(normalize_on_off "$INTEGRATION_TEST" "INTEGRATION_TEST")"
@@ -547,7 +555,7 @@ BUILD_PREBUILT_IMAGE="$(normalize_on_off "$BUILD_PREBUILT_IMAGE" "BUILD_PREBUILT
 DELETE_PREBUILT_IMAGE="$(normalize_on_off "$DELETE_PREBUILT_IMAGE" "DELETE_PREBUILT_IMAGE")"
 
 # Export variables for Docker container
-export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE
+export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE
 
 # Group 5: Viewer module targets (conditional on BUILD_ARCGIS)
 if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
@@ -599,6 +607,7 @@ log_info "BUILD_RTI=${BUILD_RTI}"
 log_group "Build Group 1 (ddscore ddsftccore ddsQoS ddsconnector ddsfts)" "$BUILD_GROUP1"
 log_group "Build Group 2 (migration_tests)" "$BUILD_GROUP2"
 log_group "Build Group 3 (application targets)" "$BUILD_GROUP3"
+log_info "BUILD_VIEWER_ONLY=${BUILD_VIEWER_ONLY}"
 log_info "RUN_CTEST=${RUN_CTEST}"
 log_info "TESTS_ONLY=${TESTS_ONLY}"
 log_info "INTEGRATION_TEST=${INTEGRATION_TEST}"
@@ -652,6 +661,7 @@ BUILD_GROUP2="${BUILD_GROUP2:-ON}"
 BUILD_GROUP3="${BUILD_GROUP3:-ON}"
 BUILD_GROUP4="${BUILD_GROUP4:-OFF}"
 BUILD_GROUP5="${BUILD_GROUP5:-OFF}"
+BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}"
 RUN_CTEST="${RUN_CTEST:-ON}"
 TESTS_ONLY="${TESTS_ONLY:-OFF}"
 INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
@@ -744,6 +754,13 @@ read -r -a GROUP4_ARRAY <<< "${GROUP4_TARGETS}"
 read -r -a GROUP5_ARRAY <<< "${GROUP5_TARGETS}"
 
 if [[ "${TESTS_ONLY}" != "ON" ]]; then
+  if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
+    log_info "BUILD_VIEWER_ONLY enabled - skipping Groups 1-4, building only Viewer module targets"
+    BUILD_GROUP1=OFF
+    BUILD_GROUP2=OFF
+    BUILD_GROUP3=OFF
+    BUILD_GROUP4=OFF
+  fi
   run_build_group "Group 1" "${BUILD_GROUP1}" "group1_build.log" "${GROUP1_ARRAY[@]}"
   run_build_group "Group 4 (DDS Tests)" "${BUILD_GROUP4}" "group4_build.log" "${GROUP4_ARRAY[@]}"
   run_build_group "Group 2" "${BUILD_GROUP2}" "group2_build.log" "${GROUP2_ARRAY[@]}"
@@ -781,6 +798,7 @@ docker run --rm \
   -e BUILD_GROUP3 \
   -e BUILD_GROUP4 \
   -e BUILD_GROUP5 \
+  -e BUILD_VIEWER_ONLY \
   -e RUN_CTEST \
   -e TESTS_ONLY \
   -e INTEGRATION_TEST \