diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
index 1b4ea17..417a545 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
@@ -12,5 +12,4 @@ export HASS_TOKEN="${SUPERVISOR_TOKEN:-}"
 
 
 # Run the code server
-cd "$CODE_SERVER_WORKSPACE_DIR" || bashio::exit.nok "Workspace path does not exist"
 exec code-server "$CODE_SERVER_WORKSPACE_FILE"
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
index 81b0ccd..68ec30b 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
@@ -22,13 +22,18 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
+DEFAULT_CONFIG_PATH="/data/vscode"
+CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
 
-source "../paths.sh"
+# shellcheck source=../paths.sh
+source "/etc/s6-overlay/s6-rc.d/paths.sh"
 run() {
-    setup_code_workspace
-    setup_clean_view
     setup_config_path
     setup_config_files
+
+    setup_code_workspace
+    setup_clean_view
+
     set_log_level
     set_user_settings
     setup_extensions
@@ -49,6 +54,7 @@ setup_clean_view() {
 setup_code_workspace() {
     # Create the workspace dir
     if [ ! -d "$CODE_SERVER_WORKSPACE_DIR" ]; then
+        bashio::log.warning "CODE_SERVER_WORKSPACE_DIR does not exist. Creating..."
         mkdir -p "$CODE_SERVER_WORKSPACE_DIR"
     fi
 
@@ -60,12 +66,13 @@ setup_code_workspace() {
 
     # .vscode dir
     if [ ! -d "$CODE_SERVER_VSCODE_DIR" ]; then
+        bashio::log.warning "CODE_SERVER_VSCODE_DIR does not exist. Creating..."
         mkdir -p "$CODE_SERVER_VSCODE_DIR"
     fi
 
     # tasks.json
     if [ ! -e "$CODE_SERVER_VSCODE_TASKS" ]; then
-        bashio::log.warning "CODE_SERVER_WORKSPACE_FILE does not exist. Creating..."
+        bashio::log.warning "CODE_SERVER_VSCODE_TASKS does not exist. Creating..."
         cp "$DEFAULT_FILES_PATH/vscode/tasks.json" "$CODE_SERVER_VSCODE_TASKS"
     fi
 }
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
index be77e48..3714ba4 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
@@ -5,7 +5,8 @@
 # Sets up code-server.
 # ==============================================================================
 bashio::log.info "Initalizing code-server configs"
-source "../paths.sh"
+# shellcheck source=../paths.sh
+source "/etc/s6-overlay/s6-rc.d/paths.sh"
 # List of previous config hashes, to allow upgrade "default" configs.
 readonly CUSTOM_BASH_SCRIPTS_PATH="/data/custom"
 readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults/core"
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh
index 23b0ba5..418fabc 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh
@@ -2,8 +2,6 @@
 # this file is to prevent spagetti paths
 # shellcheck disable=SC2034
 
-DEFAULT_CONFIG_PATH="/data/vscode"
-CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
 
 readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
 readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/" # needed for code-server to cleanly