diff --git a/hack/tfw.sh b/hack/tfw.sh
index 0ad3e7e..6a1de22 100755
--- a/hack/tfw.sh
+++ b/hack/tfw.sh
@@ -93,7 +93,7 @@ run_test()
 {
     cd "$TAO_PATH"
     mount_baseimage="-v ${BASEIMAGE_PATH}/lib/tfw:/usr/local/lib/tfw"
-    mount_test="-v $TEST_PATH/solvable/src:/srv/app"
+    mount_test="-v $TEST_PATH/solvable/src:/srv/.tfw"
     mount_volumes=""
     [ "${HOTRELOAD:-0}" == "1" ] && mount_volumes="${mount_baseimage} ${mount_test}"
     docker run --rm                                          \
diff --git a/solvable/Dockerfile b/solvable/Dockerfile
index bec1d00..9473697 100644
--- a/solvable/Dockerfile
+++ b/solvable/Dockerfile
@@ -1,17 +1,19 @@
 FROM eu.gcr.io/avatao-challengestore/tutorial-framework
 
-ENV TFW_APP_DIR="/srv/app"                          \
+ENV TFW_SERVER_DIR="/srv/.tfw"                      \
     TFW_LOGIN_APP_DIR="/tmp/source_code_server"     \
     TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir"    \
     TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
 
-COPY solvable/src ${TFW_APP_DIR}/
+COPY solvable/src ${TFW_SERVER_DIR}/
 COPY solvable/src/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
 COPY solvable/src/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
 COPY solvable/src/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
 
 RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\
-    chmod -R 755 ${TFW_WEBIDE_WD}
+    chmod -R 755 ${TFW_WEBIDE_WD}            &&\
+    chown -R root ${TFW_SERVER_DIR}          &&\
+    chmod -R 700 ${TFW_SERVER_DIR}
 
 VOLUME ["/home/${AVATAO_USER}"]
 WORKDIR /home/${AVATAO_USER}
diff --git a/solvable/supervisor/event_handlers.conf b/solvable/supervisor/event_handlers.conf
index 93fd749..ab56af2 100644
--- a/solvable/supervisor/event_handlers.conf
+++ b/solvable/supervisor/event_handlers.conf
@@ -1,4 +1,4 @@
 [program:event_handler_main]
 user=root
-directory=%(ENV_TFW_APP_DIR)s
+directory=%(ENV_TFW_SERVER_DIR)s
 command=python3 event_handler_main.py
diff --git a/solvable/supervisor/tfw_server.conf b/solvable/supervisor/tfw_server.conf
index b14d002..1422371 100644
--- a/solvable/supervisor/tfw_server.conf
+++ b/solvable/supervisor/tfw_server.conf
@@ -1,4 +1,4 @@
 [program:tfwserver]
 user=root
-directory=%(ENV_TFW_APP_DIR)s
+directory=%(ENV_TFW_SERVER_DIR)s
 command=python3 tfw_server.py
\ No newline at end of file