diff --git a/AstrocookDesktop/Dockerfile b/AstrocookDesktop/Dockerfile
index 0e04beed4ae22f06848ac144612aaa8f1d88334a..8df2f6f2718e107e1cc29e9703fba2fe065fc417 100644
--- a/AstrocookDesktop/Dockerfile
+++ b/AstrocookDesktop/Dockerfile
@@ -1,4 +1,4 @@
-FROM sarusso/basicmetadesktop:v0.2.0
+FROM basicdesktop
 MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
 
 # Switch to root user
diff --git a/base/Dockerfile b/Base/Dockerfile
similarity index 100%
rename from base/Dockerfile
rename to Base/Dockerfile
diff --git a/base/build.sh b/Base/build.sh
similarity index 100%
rename from base/build.sh
rename to Base/build.sh
diff --git a/base/files/base_entrypoint.sh b/Base/files/base_entrypoint.sh
similarity index 100%
rename from base/files/base_entrypoint.sh
rename to Base/files/base_entrypoint.sh
diff --git a/base/files/sudoers b/Base/files/sudoers
similarity index 100%
rename from base/files/sudoers
rename to Base/files/sudoers
diff --git a/base/run.sh b/Base/run.sh
similarity index 100%
rename from base/run.sh
rename to Base/run.sh
diff --git a/CasaDesktop/Dockerfile b/CasaDesktop/Dockerfile
index ef702538967eae021bb4442122428fe211e2a988..1a3b3bf1e3c844cbbbe3ddd66fd96f232d8ef9de 100644
--- a/CasaDesktop/Dockerfile
+++ b/CasaDesktop/Dockerfile
@@ -1,4 +1,4 @@
-FROM sarusso/basicmetadesktop:v0.2.0
+FROM basicdesktop
 MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
 
 # Switch to root user
diff --git a/build_all.sh b/build_all.sh
index 61f56518fa37822f217c6552483d59700ad0cbd8..4f0f6e48186cdb9faa4d8163bfb3e19dba9b8868 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd base && ./build.sh && cd ..
+cd Base && ./build.sh && cd ..
 cd SSH && ./build.sh && cd ..
 cd XCalc && ./build.sh && cd ..
 cd X11web && ./build.sh && cd ..