diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh b/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh
index 024c1e608..b36e078b3 100755
--- a/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh
+++ b/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh
@@ -496,15 +496,14 @@ GROUP3_TARGETS=(
 
 # AP9: Viewer module (DdsView, LogViewer, SqlBrowser)
 GROUP5_TARGETS=(
-  ddsView
-  logViewer
-  sqlBrowser
+  ddsview
+  LogViewer
+  sqlbrowser
 )
 
-# AP9: Tools and generators (DaoGenerator, lupdate toolchain)
+# AP9: Tools and generators (ngl_codegen toolchain)
 GROUP6_TARGETS=(
-  DaoGenerator
-  lupdate
+  ngl_codegen
 )
 
 # Build prebuilt image if requested
@@ -746,9 +745,9 @@ cmake -B "${BUILD_DIR}" \
 log_info "Building Release 2 targets..."
 
 GROUP1_TARGETS=(ddscore svcCoreClient ddsftccore ddsfts ddsgen ddsQoS ddsconnector)
-GROUP3_TARGETS=(NGLLogger nglapplication nglcompression nglcoreapplication ngldb nglguiapplication nglsettings nglsingleapplication nglsinglecoreapplication ngltools ngltranslator nglwidgets qtsingleapplication qtsinglecoreapplication wms_json_ds tcpserver LtsCoordinate LtsCoordTrans)
-GROUP5_TARGETS=(ddsView logViewer sqlBrowser)
-GROUP6_TARGETS=(DaoGenerator lupdate)
+GROUP3_TARGETS=(NGLLogger nglapplication nglcompression nglcoreapplication ngldb nglguiapplication nglsettings nglsingleapplication nglsinglecoreapplication ngltools ngltranslator nglwidgets qtsingleapplication qtsinglecoreapplication wms_json_ds tcpserver LtsCoordinate LtsCoordTrans LtsSession)
+GROUP5_TARGETS=(ddsview LogViewer sqlbrowser)
+GROUP6_TARGETS=(ngl_codegen)
 
 build_group() {
   local group_name="$1"