diff --git a/client/src/docker/lib/internal/lib_docker.bash b/client/src/docker/lib/internal/lib_docker.bash
index 15cde64..802f6d5 100644
--- a/client/src/docker/lib/internal/lib_docker.bash
+++ b/client/src/docker/lib/internal/lib_docker.bash
@@ -74,6 +74,7 @@ function lib_docker::__docker()
     -e "s|@DOCKER_FINANCE_IMAGE@|${global_image}:${global_tag}|g" \
     -e "s|@DOCKER_FINANCE_CONTAINER@|${global_container}|g" \
     -e "s|@DOCKER_FINANCE_NETWORK@|${global_network}|g" \
+    -e "/^ *#/d" -e "/^$/d" \
     "${_path}.${global_platform}.in" >"$_path" || return $?
 }
 
@@ -318,6 +319,9 @@ function lib_docker::__build()
   echo -e "# WARNING: keep at end of file\nUSER ${DOCKER_FINANCE_USER}\nWORKDIR /home/${DOCKER_FINANCE_USER}\n" \
     >>"$_final"
 
+  # Remove all comments and empty lines
+  sed -i -e "/^ *#/d" -e "/^$/d" "$_final"
+
   #
   # Execute
   #