diff --git a/entrypoint.sh b/entrypoint.sh
index 8ea2f61..d518a92 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -75,6 +75,8 @@ fi
 # Then execute entrypoint.sh
 if [ "$HOME_USER" != "$(whoami)" ]; then
   exec sudo -u $HOME_USER bash -c "source /etc/environment; /usr/bin/entrypoint.sh"
+else
+  sudo chown -R 1000: /home/${HOME_USER}
 fi
 
 # Find .sh files in /usr/bin/custom-scripts and execute them in order
diff --git a/version.txt b/version.txt
index a99de22..edd1851 100755
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.0.17
\ No newline at end of file
+3.0.18
\ No newline at end of file