diff --git a/conf/systemd.service b/conf/systemd.service
index c0e5e96..5877920 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,7 +6,7 @@ After=network.target multi-user.target
 Type=simple
 User=__ADMIN__
 Group=__ADMIN__
-WorkingDirectory=/home/__ADMIN__/
+WorkingDirectory=__DATA_DIR__
 EnvironmentFile=__INSTALL_DIR__/code-server.env
 ExecStart=__INSTALL_DIR__/bin/code-server --config __INSTALL_DIR__/config.yaml
 StandardOutput=append:/var/log/__APP__/__APP__.log
diff --git a/scripts/upgrade b/scripts/upgrade
index b38a250..2d6a82d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -132,7 +132,7 @@ then
 fi
 
 chmod 440 "$install_dir/config.yaml" "$install_dir/code-server.env"
-chown root:$admin "$install_dir/config.yaml" "$install_dir/code-server.env"
+chown $app:$app "$install_dir/config.yaml" "$install_dir/code-server.env"
 
 #=================================================
 # SETUP SYSTEMD