diff --git a/ushahidi.sh b/ushahidi.sh
index 0166a33..78d4eec 100755
--- a/ushahidi.sh
+++ b/ushahidi.sh
@@ -13,11 +13,11 @@ export USHAHIDI_PWD=$(head -c 18 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i mariadb mysql
 
 # Configure Ushahidi
-mkdir /srv/ushahidi
-envsubst <${SOURCE_DIR}/srv/ushahidi/.env >/srv/ushahidi/.env
+mkdir -p /srv/ushahidi/conf
+envsubst <${SOURCE_DIR}/srv/ushahidi/conf/env >/srv/ushahidi/conf/env
 
 # Populate database
-docker run --rm -h ushahidi --link mariadb -v /srv/ushahidi/.env:/srv/ushahidi/platform/.env ushahidi /srv/ushahidi/platform/bin/phinx migrate -c /srv/ushahidi/platform/application/phinx.php
+docker run --rm -h ushahidi --link mariadb -v /srv/ushahidi/conf/env:/srv/ushahidi/platform/.env ushahidi /srv/ushahidi/platform/bin/phinx migrate -c /srv/ushahidi/platform/application/phinx.php
 
 # Create admin account
 export USHAHIDI_ADMIN_USER=admin@example.com
diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/etc/init.d/ushahidi
index efe76f7..747fef8 100755
--- a/ushahidi/etc/init.d/ushahidi
+++ b/ushahidi/etc/init.d/ushahidi
@@ -14,7 +14,7 @@ start() {
 	-h ushahidi \
 	--link mariadb \
 	-p 127.0.0.1:9014:8014 \
-	-v /srv/ushahidi/.env:/srv/ushahidi/platform/.env \
+	-v /srv/ushahidi/conf/env:/srv/ushahidi/platform/.env \
 	ushahidi
 }
 
diff --git a/ushahidi/srv/ushahidi/.env b/ushahidi/srv/ushahidi/conf/env
similarity index 100%
rename from ushahidi/srv/ushahidi/.env
rename to ushahidi/srv/ushahidi/conf/env