diff --git a/solvable/Dockerfile b/solvable/Dockerfile
index 7dd51b0..aa6382f 100644
--- a/solvable/Dockerfile
+++ b/solvable/Dockerfile
@@ -7,9 +7,9 @@ RUN pip3 install Flask==1.0        \
                  git+https://github.com/avatao-content/tfwconnector.git#subdirectory=python3
 
 # Define variables to use later
-ENV TFW_EHMAIN_DIR="/srv/.tfw_builtin_ehs"          \
-    TFW_WEBSERVICE_DIR="/srv/webservice"            \
-    TFW_IDE_WD="/home/${AVATAO_USER}/workdir"       \
+ENV TFW_EHMAIN_DIR="${TFW_DIR}/builtin_event_handlers" \
+    TFW_WEBSERVICE_DIR="/srv/webservice"               \
+    TFW_IDE_WD="/home/${AVATAO_USER}/workdir"          \
     TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
 
 # Copy TFW related stuff to a dedicated directory
@@ -26,7 +26,8 @@ RUN mkdir -p ${TFW_IDE_WD}                                               &&\
     chmod -R 755 "${TFW_IDE_WD}" "${TFW_WEBSERVICE_DIR}"
 
 # Hide TFW related code from user
-RUN chown -R root:root ${TFW_SERVER_DIR} && chmod -R 700 ${TFW_SERVER_DIR}
+RUN chown -R root:root ${TFW_SERVER_DIR} ${TFW_DIR} &&\
+    chmod -R 700 ${TFW_SERVER_DIR} ${TFW_DIR}
 
 # Make AVATAO_USER's home writeable and set it as WORKDIR
 # Make webservice directory writable