diff --git a/client/build.gradle.kts b/client/build.gradle.kts
index 20da3102..a9442ad1 100644
--- a/client/build.gradle.kts
+++ b/client/build.gradle.kts
@@ -42,7 +42,6 @@ kotlin {
         }
         jvmMain.dependencies {
             implementation(compose.desktop.currentOs)
-            implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.ktor.client.cio)
         }
         wasmJsMain.dependencies {
diff --git a/docker/build-args/global.env b/docker/build-args/global.env
index a6b5039d..848a212d 100644
--- a/docker/build-args/global.env
+++ b/docker/build-args/global.env
@@ -9,7 +9,7 @@ GRADLE_VERSION=9.0.0
 JAVA_VERSION=21
 
 # --- Build Metadata ---
-BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
 VERSION=1.0.0
 DOCKER_APP_VERSION=1.0.0
 
diff --git a/dockerfiles/clients/web-app/Dockerfile b/dockerfiles/clients/web-app/Dockerfile
index 79ec1560..2d42d74d 100644
--- a/dockerfiles/clients/web-app/Dockerfile
+++ b/dockerfiles/clients/web-app/Dockerfile
@@ -57,6 +57,21 @@ ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
 # Set Gradle user home for better caching
 ENV GRADLE_USER_HOME=/home/gradle/.gradle
 
+# Install Node.js for Kotlin/Wasm npm operations
+ARG NODE_VERSION
+RUN apk add --no-cache \
+        nodejs \
+        npm \
+        curl && \
+    # Verify installation \
+    node --version && \
+    npm --version && \
+    # Create Gradle Node.js directory structure and symlinks \
+    mkdir -p /home/gradle/.gradle/nodejs/node-v22.0.0-linux-x64/bin && \
+    ln -sf /usr/bin/node /home/gradle/.gradle/nodejs/node-v22.0.0-linux-x64/bin/node && \
+    ln -sf /usr/bin/npm /home/gradle/.gradle/nodejs/node-v22.0.0-linux-x64/bin/npm && \
+    chown -R gradle:gradle /home/gradle/.gradle
+
 # Copy Gradle files first for better layer caching
 COPY gradle/ gradle/
 COPY gradlew gradlew.bat gradle.properties settings.gradle.kts ./
diff --git a/gradle.properties b/gradle.properties
index 92cb3bb3..be2262bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,11 @@ org.gradle.caching=true
 # org.gradle.configureondemand=true  # Deprecated - removed for Gradle 9.0 compatibility
 org.gradle.workers.max=8
 org.gradle.vfs.watch=true
+# Für bessere Performance
+org.gradle.configuration-cache=true
+
+# Browser für Tests konfigurieren
+kotlin.js.browser.karma.useChromeHeadless=false
 
 # Security and Reproducibility
 org.gradle.dependency.verification=lenient