diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
index e5bdd31..fa2b1ce 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
@@ -9,6 +9,7 @@
 source "/etc/s6-overlay/s6-rc.d/paths.sh"
 
 run() {
+    show_vars
     setup_ssh
     setup_zsh
     setup_git
@@ -16,6 +17,14 @@ run() {
     exec_config_cmds
 }
 
+show_vars() {
+    bashio::log.info "BASH VARS:"
+    set -o posix ; set | while IFS='' read -r line
+    do
+        bashio::log.info "$line"
+    done
+}
+
 setup_ssh() {
     # Store SSH settings in add-on data folder
     if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then
diff --git a/vscode/rootfs/var/lib/code-server/defaults/core/OpenMQTT.sh b/vscode/rootfs/var/lib/code-server/defaults/core/OpenMQTT.sh
new file mode 100644
index 0000000..a7c18c7
--- /dev/null
+++ b/vscode/rootfs/var/lib/code-server/defaults/core/OpenMQTT.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# shellcheck source=./PATHS.sh
+source "/etc/s6-overlay/s6-rc.d/paths.sh"
+
+# Vars
+ENABLE=false
+PULL=true
+openMQTT_git=https://github.com/1technophile/OpenMQTTGateway.git
+openmqtt_src_files="$USER_CUSTOM_DIR"/OpenMQTTGateway
+
+
+run (){
+    if [ "$ENABLE" = false ]; then
+        exit 0
+    fi
+
+    git_src
+    export -f mqtt_push
+}
+
+git_src() {
+    if [ ! -d "$openmqtt_src_files" ]; then
+        git clone "$openMQTT_git" "$openmqtt_src_files"|| bashio::log.warning "Failed to git clone"
+    else
+        if [ "$PULL" = true ]; then
+            cd "$openmqtt_src_files" || bashio::log.warning "Failed to change dir to $openmqtt_src_files"
+            git pull || bashio::log.warning "Failed to git pull"
+            cd "$CUSTOM_BASH_SCRIPTS_PATH" || "Failed to change dir back to boot scripts root"
+        fi
+
+    fi
+}
+
+mqtt_push() {
+    local reason=${1}
+
+    if test "$#" -ne 1; then
+        echo "Error: You must provide exactly 1 arguments."
+        exit 1
+    fi
+
+    cd "$openmqtt_src_files" || bashio::log.warning "Failed to change dir to $openmqtt_src_files"
+
+    git git add .
+    git commit -m "$reason"
+    git push
+
+    cd "$CUSTOM_BASH_SCRIPTS_PATH" || "Failed to change dir back to boot scripts root"
+}
+
+run
diff --git a/vscode/rootfs/var/lib/code-server/defaults/core/config.yaml b/vscode/rootfs/var/lib/code-server/defaults/core/config.yaml
index af08c3b..5ac5f0d 100644
--- a/vscode/rootfs/var/lib/code-server/defaults/core/config.yaml
+++ b/vscode/rootfs/var/lib/code-server/defaults/core/config.yaml
@@ -6,6 +6,7 @@ cert: false
 disable-getting-started-override: true
 disable-update-check: true
 disable-telemetry: true
-user-data-dir: "/config/addon_configs/vscode"
-extensions-dir: "/var/lib/code-server/config/"
+# /data is persistant storage on the HA host
+user-data-dir: "/data/vscode/user"
+extensions-dir: "/data/vscode/extensions"
 log: warn
diff --git a/vscode/rootfs/var/lib/code-server/defaults/core/custom-scripts.md b/vscode/rootfs/var/lib/code-server/defaults/core/custom-scripts.md
index c1bca20..8e8a17d 100644
--- a/vscode/rootfs/var/lib/code-server/defaults/core/custom-scripts.md
+++ b/vscode/rootfs/var/lib/code-server/defaults/core/custom-scripts.md
@@ -6,4 +6,8 @@ This directory is for shell scripts to be ran at boot time so you can add functi
 ## custom-template.sh
 
 This script is an example of a script that has an on/off switch that can allow you to add extra functionality when needed. To run it,
-change ENABLED to true and restart the VS Code server instance.
+change ENABLE to true and restart the VS Code server instance.
+
+## PATHS.sh
+
+This shows all paths used at boot time. USER_CUSTOM_DIR is for storage of build sources, etc.
diff --git a/vscode/rootfs/var/lib/code-server/defaults/core/custom-template.sh b/vscode/rootfs/var/lib/code-server/defaults/core/custom-template.sh
index d9c2159..92e71f0 100644
--- a/vscode/rootfs/var/lib/code-server/defaults/core/custom-template.sh
+++ b/vscode/rootfs/var/lib/code-server/defaults/core/custom-template.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ENABLE=false
-# shellcheck source=../paths.sh
+# shellcheck source=./PATHS.sh
 source "/etc/s6-overlay/s6-rc.d/paths.sh"
 
 if [ "$ENABLE" = true ]; then