diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 18471d873..366bed296 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -22,6 +22,10 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
+ENV PGDATA=/config/addons_config/guacamole/postgres
+ENV GUACAMOLE_HOME=/config/addons_config/guacamole
+WORKDIR /config/addons_config/guacamole
+  
 # Allow UID and GID setting
 RUN \
     # Change config location