diff --git a/MIGRATION_STATUS.md b/MIGRATION_STATUS.md
index 8f571945d..7f885876a 100644
--- a/MIGRATION_STATUS.md
+++ b/MIGRATION_STATUS.md
@@ -1,6 +1,6 @@
 # Qt5/C++11 to Qt6/C++17 Migration Status
 
-**Datum**: 2026-09-30  
+**Datum**: 2026-08-31  
 **Submodule Branch**: `feature/qt6-migration-basis-modules` @ d176b5e  
 **Docker-Image**: `migration-pipeline:ubuntu26.04`  
 **C++ Standard**: C++17 (⚠️ RTI 7.7 kompatibel nur mit C++17, NICHT C++23)
diff --git a/app/Dockerfile b/app/Dockerfile
index bb5393ef4..70e100cbb 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -49,6 +49,7 @@ RUN apt-get update \
         libqt6qml6 \
         libqt6qmlmodels6 \
         libqt6quick6 \
+        libkf6texttemplate-dev \
         unzip \
         python3 \
         python3-venv \
diff --git a/app/run_docker.sh b/app/run_docker.sh
index 96d92967f..feb3ce62b 100755
--- a/app/run_docker.sh
+++ b/app/run_docker.sh
@@ -105,6 +105,16 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# Check if we're already running inside a Docker container (must be after CMD_ARGS parsing)
+if [[ -f /.dockerenv ]]; then
+  echo "Already running inside Docker container, executing command directly."
+  if [[ ${#CMD_ARGS[@]} -gt 0 ]]; then
+    exec bash -lc "${CMD_ARGS[*]}"
+  else
+    exec bash
+  fi
+fi
+
 HOST_UID="$(id -u)"
 HOST_GID="$(id -g)"
 
@@ -167,7 +177,13 @@ if [[ ! -f "$SCRIPT_DIR/.env" ]]; then
   exit 1
 fi
 
-docker build -t "$IMAGE_NAME" "$SCRIPT_DIR"
+# Build Docker image only if it doesn't exist
+if ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then
+  echo "Building Docker image $IMAGE_NAME..."
+  docker build -t "$IMAGE_NAME" "$SCRIPT_DIR"
+else
+  echo "Docker image $IMAGE_NAME already exists, skipping build."
+fi
 
 if [[ $RUN_QT_SMOKE_TEST -eq 1 ]]; then
   CMD_ARGS=(
@@ -219,31 +235,96 @@ elif [[ ${#CMD_ARGS[@]} -eq 0 ]]; then
   CMD_ARGS=(bash)
 fi
 
+# If CMD_ARGS contains a single element that starts with 'bash' or is a complex command,
+# pass it directly to bash -lc instead of using bash -s
+RUN_DIRECT_BASH=0
+if [[ ${#CMD_ARGS[@]} -eq 1 ]] && [[ "${CMD_ARGS[0]}" == bash* ]]; then
+  RUN_DIRECT_BASH=1
+fi
+
+# Check if command contains pipes, redirects, or other complex shell syntax
+HAS_COMPLEX_SYNTAX=0
+if [[ ${#CMD_ARGS[@]} -gt 0 ]]; then
+  case "${CMD_ARGS[*]}" in
+    *'|'*|*'&'*|*';'*|*'>'*|*'<'*|*'$('*|*'`'*) HAS_COMPLEX_SYNTAX=1 ;;
+  esac
+fi
+
 if [ -t 1 ]; then
   DOCKER_TTY_FLAG="-it"
 else
   DOCKER_TTY_FLAG="-i"
 fi
 
-docker run --rm $DOCKER_TTY_FLAG $DOCKER_NAME_FLAG \
-  --user root \
-  --env-file "$SCRIPT_DIR/.env" \
-  -v "$SCRIPT_DIR:/app" \
-  "${DOCKER_ARGS[@]}" \
-  -w "$WORKDIR_IN_CONTAINER" \
-  -e LOCAL_UID="$HOST_UID" \
-  -e LOCAL_GID="$HOST_GID" \
-  -e LOCAL_USER="$CONTAINER_USER" \
-  -e LOCAL_GROUP="$CONTAINER_GROUP" \
-  -e ENABLE_CONTAINER_SUDO="$ENABLE_CONTAINER_SUDO" \
-  -e WORKDIR_IN_CONTAINER="$WORKDIR_IN_CONTAINER" \
-  -e QT_ROOT="$QT_ROOT_OVERRIDE" \
-  -e Qt6_ROOT="$QT_ROOT_OVERRIDE" \
-  -e EXTERNAL_DIR="/repo/external" \
-  -e CMAKE_PREFIX_PATH="$QT_ROOT_OVERRIDE:/repo/external" \
-  -e PROJECT_BASE_DIR="${PROJECT_BASE_DIR:-./}" \
-  "$IMAGE_NAME" \
-  bash -s -- "${CMD_ARGS[@]}" <<'DOCKER_SCRIPT'
+# Allow DDS_PATH and RTI_LICENSE_FILE to be passed from caller
+if [[ -n "${DDS_PATH:-}" ]]; then
+  export DDS_PATH
+fi
+if [[ -n "${RTI_LICENSE_FILE:-}" ]]; then
+  export RTI_LICENSE_FILE
+fi
+
+if [ -t 1 ]; then
+  DOCKER_TTY_FLAG="-it"
+else
+  DOCKER_TTY_FLAG="-i"
+fi
+
+# Allow DDS_PATH and RTI_LICENSE_FILE to be passed from caller
+if [[ -n "${DDS_PATH:-}" ]]; then
+  export DDS_PATH
+fi
+if [[ -n "${RTI_LICENSE_FILE:-}" ]]; then
+  export RTI_LICENSE_FILE
+fi
+
+# Execute docker run with appropriate command handling
+if [[ $RUN_DIRECT_BASH -eq 1 ]] || [[ $HAS_COMPLEX_SYNTAX -eq 1 ]]; then
+  # For complex commands with pipes/redirects, use bash -lc directly
+  docker run --rm $DOCKER_TTY_FLAG $DOCKER_NAME_FLAG \
+    --user root \
+    --env-file "$SCRIPT_DIR/.env" \
+    -v "$SCRIPT_DIR:/app" \
+    "${DOCKER_ARGS[@]}" \
+    -w "$WORKDIR_IN_CONTAINER" \
+    -e LOCAL_UID="$HOST_UID" \
+    -e LOCAL_GID="$HOST_GID" \
+    -e LOCAL_USER="$CONTAINER_USER" \
+    -e LOCAL_GROUP="$CONTAINER_GROUP" \
+    -e ENABLE_CONTAINER_SUDO="$ENABLE_CONTAINER_SUDO" \
+    -e WORKDIR_IN_CONTAINER="$WORKDIR_IN_CONTAINER" \
+    -e QT_ROOT="$QT_ROOT_OVERRIDE" \
+    -e Qt6_ROOT="$QT_ROOT_OVERRIDE" \
+    -e EXTERNAL_DIR="/repo/external" \
+    -e CMAKE_PREFIX_PATH="$QT_ROOT_OVERRIDE:/repo/external" \
+    -e PROJECT_BASE_DIR="${PROJECT_BASE_DIR:-./}" \
+    -e DDS_PATH="${DDS_PATH:-}" \
+    -e RTI_LICENSE_FILE="${RTI_LICENSE_FILE:-}" \
+    "$IMAGE_NAME" \
+    bash -lc "${CMD_ARGS[*]}"
+else
+  # For simple commands, use heredoc approach
+  docker run --rm $DOCKER_TTY_FLAG $DOCKER_NAME_FLAG \
+    --user root \
+    --env-file "$SCRIPT_DIR/.env" \
+    -v "$SCRIPT_DIR:/app" \
+    "${DOCKER_ARGS[@]}" \
+    -w "$WORKDIR_IN_CONTAINER" \
+    -e LOCAL_UID="$HOST_UID" \
+    -e LOCAL_GID="$HOST_GID" \
+    -e LOCAL_USER="$CONTAINER_USER" \
+    -e LOCAL_GROUP="$CONTAINER_GROUP" \
+    -e ENABLE_CONTAINER_SUDO="$ENABLE_CONTAINER_SUDO" \
+    -e WORKDIR_IN_CONTAINER="$WORKDIR_IN_CONTAINER" \
+    -e QT_ROOT="$QT_ROOT_OVERRIDE" \
+    -e Qt6_ROOT="$QT_ROOT_OVERRIDE" \
+    -e EXTERNAL_DIR="/repo/external" \
+    -e CMAKE_PREFIX_PATH="$QT_ROOT_OVERRIDE:/repo/external" \
+    -e PROJECT_BASE_DIR="${PROJECT_BASE_DIR:-./}" \
+    -e DDS_PATH="${DDS_PATH:-}" \
+    -e RTI_LICENSE_FILE="${RTI_LICENSE_FILE:-}" \
+    "$IMAGE_NAME" \
+    bash -s -- "${CMD_ARGS[@]}" <<'DOCKER_SCRIPT'
 set -euo pipefail
 
 ensure_group() {
@@ -344,3 +425,4 @@ cd "${WORKDIR_IN_CONTAINER}"
 
 exec runuser -u "${LOCAL_USER}" -- "$@"
 DOCKER_SCRIPT
+fi