diff --git a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
index f8a104cb6ab862f68719359344e90ceb92488d5d..06e81f7bd40ac2b452aef690b3138dcc234feb29 100644
--- a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
+++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
@@ -7,7 +7,7 @@
   </formats>
   <baseDirectory>xplan-docker-mapproxy</baseDirectory>
   <dependencySets>
-    <!--xplan-manager-config-->
+    <!--xplan-mapproxy-config-->
     <dependencySet>
       <outputDirectory>/xplan-mapproxy-config</outputDirectory>
       <includes>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
index e3e7784d453238452b38fbc407b876231625a243..ab02526007ecb3467b78d21733ec0fb6472753b6 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
@@ -20,12 +20,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
 ENV TZ=Europe/Berlin
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata
 
-RUN mkdir -p /xplan-docker-mapserver \
+RUN mkdir -p /xplan-mapserver-config \
 	&& chown 1001 /etc/mapserver
 
 ADD target/xplan-mapserver-docker-*.tgz /
-ADD startupWithConfiguredMapserver.sh /xplan-docker-mapserver/
+ADD startupWithConfiguredMapserver.sh /xplan-mapserver-config/
 
 USER 1001
 
-CMD ["/xplan-docker-mapserver/startupWithConfiguredMapserver.sh"]
\ No newline at end of file
+CMD ["/xplan-mapserver-config/startupWithConfiguredMapserver.sh"]
\ No newline at end of file
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
index dfd23baccf71156b67f3b929dd67a8ae33fa6f69..b56d65b65ac6f6e8cfe20adab56211671f692a34 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>src/assembly/xplan-docker-mapserver.xml</descriptor>
+            <descriptor>src/assembly/xplan-mapserver-docker.xml</descriptor>
           </descriptors>
           <appendAssemblyId>false</appendAssemblyId>
         </configuration>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
similarity index 88%
rename from xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
index 11f42ead88d59d9724e364fa2a42c00bdbc329eb..13dad84c19993f3058dec37ce93a023422a242bc 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
@@ -1,11 +1,11 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>xplan-docker-mapserver</id>
+  <id>xplan-mapserver-docker</id>
   <formats>
     <format>tgz</format>
   </formats>
-  <baseDirectory>xplan-docker-mapserver</baseDirectory>
+  <baseDirectory>xplan-mapserver-config</baseDirectory>
   <dependencySets>
     <!--xplan-mapserver-config-->
     <dependencySet>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
index 6bf72c3640f5791a5c820d744d6cc930335a3b84..783b7beac424bdc672bbf0f94ea62fb4e7209db1 100755
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
@@ -3,7 +3,7 @@
 echo "MapServer config initialization..."
 
 if [ -z ${MS_MAPFILE+x} ]; then
-	echo "ERROR: environment variable MS_MAPFILE not set!"
+	echo "[$(date -Iseconds)] ERROR: environment variable MS_MAPFILE not set!"
 	exit 1
 fi
 
@@ -15,7 +15,7 @@ fi
 
 echo "[$(date -Iseconds)] Initializing mapserver config ..."
 
-cp /xplan-docker-mapserver/xplan-mapserver-config/mapserver.map $MS_MAPFILE
+cp /xplan-mapserver-config/xplan-mapserver-config/mapserver.map $MS_MAPFILE
 
 XPLAN_S3_BUCKET_NAME="${XPLAN_S3_BUCKET_NAME:-tobedefined}"
 AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-tobedefined}"