diff --git a/MinimalDesktop/Dockerfile b/MinimalDesktop/Dockerfile
index ae4cc3ceac116329d8a2ba9372bb30e675b2620c..b35d31066ba6c915b324db50dcfcbfd9afc21588 100644
--- a/MinimalDesktop/Dockerfile
+++ b/MinimalDesktop/Dockerfile
@@ -20,15 +20,15 @@ COPY files/background.jpg /usr/share/images/fluxbox/background.jpg
 RUN chmod 777 /home
 
 # Set entrypoint commands
-COPY files/start_fluxbox.sh /
-RUN chmod 755 /start_fluxbox.sh
-ENV X11_ENTRYPOINT_COMMAND="/start_fluxbox.sh"
+COPY files/start_fluxbox.sh /usr/bin/start_fluxbox.sh
+RUN chmod 755 /usr/bin/start_fluxbox.sh
+ENV X11_ENTRYPOINT_COMMAND="/usr/bin/start_fluxbox.sh"
 
 # Set user
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='MinimalDesktop'
+ENV CONTAINER_NAME='minimaldesktop'
 
 
 
diff --git a/MinimalDesktop/run.sh b/MinimalDesktop/run.sh
index 54be1222387cd5ab6eb5f1ec90c263dd9ff0ad54..456d4449467c0e3823ec2d7fa1a828cd9c13d5ee 100755
--- a/MinimalDesktop/run.sh
+++ b/MinimalDesktop/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -v$PWD/:/data -p8590:8590 -eBASE_PORT=8590 -eAAUTH_PASS=testpass -it minimaldesktop
+docker run -v$PWD/:/data -p8590:8590 -eBASE_PORT=8590 -eAUTH_PASS=testpass -it minimaldesktop
diff --git a/SSH/Dockerfile b/SSH/Dockerfile
index 29b43f03f2ae1288cc8ff2de2a1b369b8539ee94..01074451e92cb4b1dfeb3f6ad25e3bd2ae145c89 100644
--- a/SSH/Dockerfile
+++ b/SSH/Dockerfile
@@ -11,9 +11,9 @@ RUN apt-get install openssh-server  -y
 RUN echo "metauser:metapass" | chpasswd
 
 # Set entrypoint command
-COPY files/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-ENV DEFAULT_ENTRYPOINT_COMMAND="/entrypoint.sh"
+COPY files/entrypoint.sh /usr/bin/entrypoint.sh
+RUN chmod 755 /usr/bin/entrypoint.sh
+ENV DEFAULT_ENTRYPOINT_COMMAND="/usr/bin/entrypoint.sh"
 
 # Fix home permissions
 RUN chmod 777 /home
@@ -22,7 +22,7 @@ RUN chmod 777 /home
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='SSH'
+ENV CONTAINER_NAME='ssh'
 
 
 
diff --git a/X11Web/Dockerfile b/X11Web/Dockerfile
index 22c0bfbab6496266b8eb19581e9b9c9669ea3432..95d75bb398d73294d52d81a701307129cda568ca 100644
--- a/X11Web/Dockerfile
+++ b/X11Web/Dockerfile
@@ -55,13 +55,13 @@ RUN chmod 755 /opt/tigervnc/xstartup
 RUN chmod 777 /home
 
 # Set entrypoint command
-ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord -c /etc/supervisor/supervisord.conf"
+ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord"
 
 # Set user
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='X11Web'
+ENV CONTAINER_NAME='x11web'
 
 
 
diff --git a/XCalc/Dockerfile b/XCalc/Dockerfile
index ff133c635e2d40e1bed4fb49bca8df1297473d1a..181b33dc65c7026d71307229785a1e124425e746 100644
--- a/XCalc/Dockerfile
+++ b/XCalc/Dockerfile
@@ -14,7 +14,7 @@ RUN chmod 777 /home
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='XCalc'
+ENV CONTAINER_NAME='xcalc'
 
 
 
diff --git a/base/Dockerfile b/base/Dockerfile
index b0612b6d555af416f4e4b2ccb9731e9da9c0c353..f79ffb4a18b474d7f81e6c3ac41c00a288062826 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -44,9 +44,9 @@ RUN mv /home/metauser /metauser_home_vanilla
 ENV CONTAINER_NAME='base'
 
 # Entrypoint
-COPY files/base_entrypoint.sh /
-RUN chmod 755 /base_entrypoint.sh
-ENTRYPOINT ["/base_entrypoint.sh"]
+COPY files/base_entrypoint.sh /usr/bin/base_entrypoint.sh
+RUN chmod 755 /usr/bin/base_entrypoint.sh
+ENTRYPOINT ["/usr/bin/base_entrypoint.sh"]
 ENV DEFAULT_ENTRYPOINT_COMMAND="/bin/bash"
 
 # Allow to move the /home_vanilla folder in /home