diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 003933f3d..ba4c2da76 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -28,16 +28,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 
-ENV PGDATA=/config/addons_config/guacamole/postgres
-ENV GUACAMOLE_HOME=/config/addons_config/guacamole
-WORKDIR /config/addons_config/guacamole
+ENV PGDATA=/config/postgres
+ENV GUACAMOLE_HOME=/config
+WORKDIR /config
 
 # hadolint ignore=SC2016
 RUN \
-    # Change config location
-    sed -i 's|/config|/config/addons_config/guacamole|g' /etc/cont-init.d/* \
-    && sed -i 's|/config|/config/addons_config/guacamole|g' /etc/services.d/*/run \
-    \
     # Enable extensions
     && sed -i 's|#!/usr/bin/with-contenv sh|#!/usr/bin/with-contenv bashio|g' /etc/cont-init.d/50-extensions.sh \
     && sed -i 's|$EXTENSIONS|$(bashio::config "EXTENSIONS")|g' /etc/cont-init.d/50-extensions.sh \
@@ -55,7 +51,7 @@ RUN \
     && sed -i "s|s6-socklog -d3 -U -t3000|s6-socklog -d3 -U -t3000 -x /tmpsock/syslog|g" /etc/s6-overlay/s6-rc.d/syslogd/run \
     \
     # Allow custom fonts
-    && sed -i '\|<dir>/usr/share/fonts</dir>|a\ \ \ \ \ \ \ \ <dir>/config/addons_config/guacamole/fonts</dir>' /etc/fonts/fonts.conf \
+    && sed -i '\|<dir>/usr/share/fonts</dir>|a\ \ \ \ \ \ \ \ <dir>/config/fonts</dir>' /etc/fonts/fonts.conf \
     \
     # Avoid https://github.com/alexbelgium/hassio-addons/issues/659
     && rm -r /run/shm