diff --git a/Dockerfile b/Dockerfile
index 55b179983..cbb20111c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 COPY scripts /scripts
 COPY pipeline /pipeline
 COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-#COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
-COPY build/libs/*.jar app.jar
+COPY stirling-pdf/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
diff --git a/Dockerfile.fat b/Dockerfile.fat
index df444d1ea..682fac663 100644
--- a/Dockerfile.fat
+++ b/Dockerfile.fat
@@ -5,6 +5,7 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
+COPY stirling-pdf/build.gradle stirling-pdf/.
 COPY common/build.gradle common/.
 COPY proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
@@ -27,7 +28,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 COPY scripts /scripts
 COPY pipeline /pipeline
 COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY --from=build /app/build/libs/*.jar app.jar
+COPY --from=build /app/stirling-pdf/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
diff --git a/build.gradle b/build.gradle
index 96b8a7431..2f7a351ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,9 +50,7 @@ sourceSets {
                 && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
                 exclude 'stirling/software/proprietary/security/**'
             }
-			println "STIRLING_PDF_DESKTOP_UI here3"
             if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-            println "STIRLING_PDF_DESKTOP_UI here4"
                 exclude 'stirling/software/SPDF/UI/impl/**'
             }
 
diff --git a/stirling-pdf/build.gradle b/stirling-pdf/build.gradle
index 65272fc48..8ab50f9fa 100644
--- a/stirling-pdf/build.gradle
+++ b/stirling-pdf/build.gradle
@@ -94,10 +94,7 @@ sourceSets {
                 && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
                 exclude 'stirling/software/proprietary/security/**'
             }
-			
-			println "STIRLING_PDF_DESKTOP_UI here1"
             if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-            println "STIRLING_PDF_DESKTOP_UI here2"
                 exclude 'stirling/software/SPDF/UI/impl/**'
             }
         }