diff --git a/ct/yt-dlp-webui.sh b/ct/yt-dlp-webui.sh
index a2112d0fa..2901995c8 100644
--- a/ct/yt-dlp-webui.sh
+++ b/ct/yt-dlp-webui.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -29,9 +29,9 @@ function update_script() {
   fi
 
   if check_for_gh_release "yt-dlp-webui" "marcopiovanello/yt-dlp-web-ui"; then
-    msg_info "Stopping $APP"
+    msg_info "Stopping Service"
     systemctl stop yt-dlp-webui
-    msg_ok "Stopped $APP"
+    msg_ok "Stopped Service"
 
     msg_info "Updating yt-dlp"
     $STD yt-dlp -U
@@ -40,9 +40,9 @@ function update_script() {
     rm -rf /usr/local/bin/yt-dlp-webui
     fetch_and_deploy_gh_release "yt-dlp-webui" "marcopiovanello/yt-dlp-web-ui" "singlefile" "latest" "/usr/local/bin" "yt-dlp-webui_linux-amd64"
 
-    msg_info "Starting $APP"
+    msg_info "Starting Service"
     systemctl start yt-dlp-webui
-    msg_ok "Started $APP"
+    msg_ok "Started Service"
     msg_ok "Updated Successfully"
   fi
   exit
diff --git a/ct/zammad.sh b/ct/zammad.sh
index 5b5bc81e4..bf9f2fe5f 100644
--- a/ct/zammad.sh
+++ b/ct/zammad.sh
@@ -11,7 +11,7 @@ var_disk="${var_disk:-8}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-4096}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,25 +20,29 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -d /opt/zammad ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Stopping Service"
-    $STD systemctl stop zammad
-    msg_info "Updating ${APP}"
-    $STD apt-get update
-    $STD apt-mark hold zammad
-    $STD apt-get -y upgrade
-    $STD apt-mark unhold zammad
-    $STD apt-get -y upgrade
-    msg_info "Starting Service"
-    $STD systemctl start zammad
-    msg_ok "Updated ${APP} LXC"
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -d /opt/zammad ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  msg_info "Stopping Service"
+  systemctl stop zammad
+  msg_ok "Stopped Service"
+
+  msg_info "Updating ${APP}"
+  $STD apt update
+  $STD apt-mark hold zammad
+  $STD apt -y upgrade
+  $STD apt-mark unhold zammad
+  $STD apt -y upgrade
+  msg_ok "Updated ${APP}"
+
+  msg_info "Starting Service"
+  systemctl start zammad
+  msg_ok "Updated ${APP} LXC"
+  exit
 }
 
 start
@@ -48,4 +52,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
\ No newline at end of file
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
diff --git a/ct/zerotier-one.sh b/ct/zerotier-one.sh
index 98337bc19..10d9e41ef 100644
--- a/ct/zerotier-one.sh
+++ b/ct/zerotier-one.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,26 +20,28 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
+  header_info
+  check_container_storage
+  check_container_resources
 
-    if [[ ! -f /usr/sbin/zerotier-one ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Stopping Service"
-    systemctl stop zerotier-one
-    msg_ok "Stopping Service"
-    msg_info "Updating ${APP}"
-    $STD apt-get update
-    apt-get -y upgrade
-    msg_ok "Updated ${APP}"
-
-    msg_info "Starting Service"
-    systemctl start zerotier-one
-    msg_ok "Started Service"
+  if [[ ! -f /usr/sbin/zerotier-one ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+
+  msg_info "Stopping Service"
+  systemctl stop zerotier-one
+  msg_ok "Stopping Service"
+
+  msg_info "Updating ${APP}"
+  $STD apt update
+  $STD apt -y upgrade
+  msg_ok "Updated ${APP}"
+
+  msg_info "Starting Service"
+  systemctl start zerotier-one
+  msg_ok "Started Service"
+  exit
 }
 
 start
@@ -49,4 +51,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following IP:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}https://${IP}:3443${CL}"
\ No newline at end of file
+echo -e "${TAB}${GATEWAY}${BGN}https://${IP}:3443${CL}"
diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh
index 4a76a8da8..af525d86a 100644
--- a/ct/zigbee2mqtt.sh
+++ b/ct/zigbee2mqtt.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-5}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-0}"
 
 header_info "$APP"
@@ -30,7 +30,6 @@ function update_script() {
 
   if check_for_gh_release "Zigbee2MQTT" "Koenkk/zigbee2mqtt"; then
     NODE_VERSION=24 NODE_MODULE="pnpm@$(curl -fsSL https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/master/package.json | jq -r '.packageManager | split("@")[1]')" setup_nodejs
-
     msg_info "Stopping Service"
     systemctl stop zigbee2mqtt
     msg_ok "Stopped Service"
diff --git a/ct/zipline.sh b/ct/zipline.sh
index 8aac7c5f2..834c35565 100644
--- a/ct/zipline.sh
+++ b/ct/zipline.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-5}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -26,12 +26,8 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  if ! command -v pnpm &>/dev/null; then
-    msg_info "Installing pnpm"
-    #export NODE_OPTIONS=--openssl-legacy-provider
-    $STD npm install -g pnpm@latest
-    msg_ok "Installed pnpm"
-  fi
+
+  NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
 
   if check_for_gh_release "zipline" "diced/zipline"; then
     msg_info "Stopping Service"
@@ -47,7 +43,7 @@ function update_script() {
     fetch_and_deploy_gh_release "zipline" "diced/zipline" "tarball"
 
     msg_info "Updating ${APP}"
-    cd /opt/zipline
+    cd /opt/zipline || exit
     mv /opt/.env /opt/zipline/.env
     $STD pnpm install
     $STD pnpm build
diff --git a/ct/zitadel.sh b/ct/zitadel.sh
index 3255cc6cb..039cbf67d 100644
--- a/ct/zitadel.sh
+++ b/ct/zitadel.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-8}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/ct/zoraxy.sh b/ct/zoraxy.sh
index 500798526..8d9e37e55 100644
--- a/ct/zoraxy.sh
+++ b/ct/zoraxy.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-6}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/ct/zot-registry.sh b/ct/zot-registry.sh
index 381dfc289..2918dce7f 100644
--- a/ct/zot-registry.sh
+++ b/ct/zot-registry.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-5}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh
index eef1c3c6d..c33aa397e 100644
--- a/ct/zwave-js-ui.sh
+++ b/ct/zwave-js-ui.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-0}"
 
 header_info "$APP"
diff --git a/frontend/public/json/yt-dlp-webui.json b/frontend/public/json/yt-dlp-webui.json
index a9c0890fc..21d897c12 100644
--- a/frontend/public/json/yt-dlp-webui.json
+++ b/frontend/public/json/yt-dlp-webui.json
@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 4,
         "os": "Debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zammad.json b/frontend/public/json/zammad.json
index 92b752b7c..47b738a30 100644
--- a/frontend/public/json/zammad.json
+++ b/frontend/public/json/zammad.json
@@ -23,7 +23,7 @@
         "ram": 4096,
         "hdd": 8,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zerotier-one.json b/frontend/public/json/zerotier-one.json
index 670f8e626..8a67eb1d3 100644
--- a/frontend/public/json/zerotier-one.json
+++ b/frontend/public/json/zerotier-one.json
@@ -1,35 +1,35 @@
 {
-    "name": "Zerotier-One",
-    "slug": "zerotier-one",
-    "categories": [
-        4
-    ],
-    "date_created": "2024-05-02",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 3443,
-    "documentation": "https://docs.zerotier.com/",
-    "website": "https://www.zerotier.com/",
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/zerotier.webp",
-    "config_path": "/opt/key-networks/ztncui/.env",
-    "description": "ZeroTier is a secure network overlay that allows you to manage all of your network resources as if they were on the same LAN. The software-defined solution can be deployed in minutes from anywhere. No matter how many devices you need to connect, or where they are in the world, ZeroTier makes global networking simple.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/zerotier-one.sh",
-            "resources": {
-                "cpu": 1,
-                "ram": 512,
-                "hdd": 4,
-                "os": "debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": "admin",
-        "password": "password"
-    },
-    "notes": []
+  "name": "Zerotier-One",
+  "slug": "zerotier-one",
+  "categories": [
+    4
+  ],
+  "date_created": "2024-05-02",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 3443,
+  "documentation": "https://docs.zerotier.com/",
+  "website": "https://www.zerotier.com/",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/zerotier.webp",
+  "config_path": "/opt/key-networks/ztncui/.env",
+  "description": "ZeroTier is a secure network overlay that allows you to manage all of your network resources as if they were on the same LAN. The software-defined solution can be deployed in minutes from anywhere. No matter how many devices you need to connect, or where they are in the world, ZeroTier makes global networking simple.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/zerotier-one.sh",
+      "resources": {
+        "cpu": 1,
+        "ram": 512,
+        "hdd": 4,
+        "os": "debian",
+        "version": "13"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": "admin",
+    "password": "password"
+  },
+  "notes": []
 }
diff --git a/frontend/public/json/zigbee2mqtt.json b/frontend/public/json/zigbee2mqtt.json
index f205071ad..cef207055 100644
--- a/frontend/public/json/zigbee2mqtt.json
+++ b/frontend/public/json/zigbee2mqtt.json
@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 5,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     },
     {
diff --git a/frontend/public/json/zipline.json b/frontend/public/json/zipline.json
index 69ca1c364..cc2672a8b 100644
--- a/frontend/public/json/zipline.json
+++ b/frontend/public/json/zipline.json
@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 5,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zitadel.json b/frontend/public/json/zitadel.json
index 92fe0ff0f..e9a9f193f 100644
--- a/frontend/public/json/zitadel.json
+++ b/frontend/public/json/zitadel.json
@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 8,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zoraxy.json b/frontend/public/json/zoraxy.json
index 6436402e6..c9de75ab6 100644
--- a/frontend/public/json/zoraxy.json
+++ b/frontend/public/json/zoraxy.json
@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 6,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zot-registry.json b/frontend/public/json/zot-registry.json
index 4cfb98b22..8ef7baf32 100644
--- a/frontend/public/json/zot-registry.json
+++ b/frontend/public/json/zot-registry.json
@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 5,
         "os": "Debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/frontend/public/json/zwave-js-ui.json b/frontend/public/json/zwave-js-ui.json
index 91dfee86e..7344f2113 100644
--- a/frontend/public/json/zwave-js-ui.json
+++ b/frontend/public/json/zwave-js-ui.json
@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 4,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/install/yt-dlp-webui-install.sh b/install/yt-dlp-webui-install.sh
index cc04f2c52..f6db291e7 100644
--- a/install/yt-dlp-webui-install.sh
+++ b/install/yt-dlp-webui-install.sh
@@ -14,20 +14,20 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y ffmpeg
+$STD apt install -y ffmpeg
 msg_ok "Installed Dependencies"
 
 fetch_and_deploy_gh_release "yt-dlp-webui" "marcopiovanello/yt-dlp-web-ui" "singlefile" "latest" "/usr/local/bin" "yt-dlp-webui_linux-amd64"
 fetch_and_deploy_gh_release "yt-dlp" "yt-dlp/yt-dlp" "singlefile" "latest" "/usr/local/bin" "yt-dlp"
 
-msg_info "Setting up ${APPLICATION}"
+msg_info "Setting up YT-DLP-WEBUI"
 mkdir -p /opt/yt-dlp-webui
 mkdir /downloads
 RPC_PASSWORD=$(openssl rand -base64 16)
 {
-    echo "yt-dlp-webui-Credentials"
-    echo "Username: admin"
-    echo "Password: ${RPC_PASSWORD}"
+  echo "yt-dlp-webui-Credentials"
+  echo "Username: admin"
+  echo "Password: ${RPC_PASSWORD}"
 } >>~/yt-dlp-webui.creds
 
 cat <<EOF >/opt/yt-dlp-webui/config.conf
@@ -66,7 +66,9 @@ downloaderPath: /usr/local/bin/yt-dlp
 # [optional] Path where a custom frontend will be loaded (instead of the embedded one)
 #frontend_path: ./web/solid-frontend
 EOF
+msg_ok "Set up YT-DLP-WEBUI"
 
+msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/yt-dlp-webui.service
 [Unit]
 Description=yt-dlp-webui service file
@@ -79,12 +81,13 @@ ExecStart=/usr/local/bin/yt-dlp-webui --conf /opt/yt-dlp-webui/config.conf
 WantedBy=multi-user.target
 EOF
 systemctl enable -q --now yt-dlp-webui
-msg_ok "Set up ${APPLICATION}"
+msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zammad-install.sh b/install/zammad-install.sh
index 0018d52c2..ba5357b64 100644
--- a/install/zammad-install.sh
+++ b/install/zammad-install.sh
@@ -14,7 +14,7 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
   git \
   nginx \
   apt-transport-https
@@ -22,9 +22,15 @@ msg_ok "Installed Dependencies"
 
 msg_info "Setting up Elasticsearch"
 curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/7.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-7.x.list >/dev/null
-$STD apt-get update
-$STD apt-get -y install elasticsearch
+cat <<EOF | sudo tee /etc/apt/sources.list.d/elasticsearch.sources >/dev/null
+Types: deb
+URIs: https://artifacts.elastic.co/packages/7.x/apt
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/elasticsearch-keyring.gpg
+EOF
+$STD apt update
+$STD apt -y install elasticsearch
 echo "-Xms2g" >>/etc/elasticsearch/jvm.options
 echo "-Xmx2g" >>/etc/elasticsearch/jvm.options
 $STD /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment -b
@@ -34,9 +40,15 @@ msg_ok "Setup Elasticsearch"
 
 msg_info "Installing Zammad"
 curl -fsSL https://dl.packager.io/srv/zammad/zammad/key | gpg --dearmor | sudo tee /etc/apt/keyrings/pkgr-zammad.gpg >/dev/null
-echo "deb [signed-by=/etc/apt/keyrings/pkgr-zammad.gpg] https://dl.packager.io/srv/deb/zammad/zammad/stable/debian 12 main" | sudo tee /etc/apt/sources.list.d/zammad.list >/dev/null
-$STD apt-get update
-$STD apt-get -y install zammad
+cat <<EOF | sudo tee /etc/apt/sources.list.d/zammad.sources >/dev/null
+Types: deb
+URIs: https://dl.packager.io/srv/deb/zammad/zammad/stable/debian
+Suites: 13
+Components: main
+Signed-By: /etc/apt/keyrings/pkgr-zammad.gpg
+EOF
+$STD apt update
+$STD apt -y install zammad
 $STD zammad run rails r "Setting.set('es_url', 'http://localhost:9200')"
 $STD zammad run rake zammad:searchindex:rebuild
 msg_ok "Installed Zammad"
@@ -52,6 +64,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zerotier-one-install.sh b/install/zerotier-one-install.sh
index 616c0c430..0097b1409 100644
--- a/install/zerotier-one-install.sh
+++ b/install/zerotier-one-install.sh
@@ -35,6 +35,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zigbee2mqtt-install.sh b/install/zigbee2mqtt-install.sh
index f56b374f3..e58a20dd7 100644
--- a/install/zigbee2mqtt-install.sh
+++ b/install/zigbee2mqtt-install.sh
@@ -14,7 +14,7 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
   git \
   make \
   g++ \
@@ -28,9 +28,9 @@ NODE_VERSION="24" NODE_MODULE="pnpm@$(curl -fsSL https://raw.githubusercontent.c
 fetch_and_deploy_gh_release "Zigbee2MQTT" "Koenkk/zigbee2mqtt" "tarball" "latest" "/opt/zigbee2mqtt"
 
 msg_info "Setting up Zigbee2MQTT"
-cd /opt/zigbee2mqtt/data
+cd /opt/zigbee2mqtt/data || exit
 mv configuration.example.yaml configuration.yaml
-cd /opt/zigbee2mqtt
+cd /opt/zigbee2mqtt || exit
 $STD pnpm install --no-frozen-lockfile
 $STD pnpm build
 msg_ok "Installed Zigbee2MQTT"
@@ -58,6 +58,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zipline-install.sh b/install/zipline-install.sh
index 822089bd8..524f74bbe 100644
--- a/install/zipline-install.sh
+++ b/install/zipline-install.sh
@@ -14,8 +14,8 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
-PG_VERSION="16" setup_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
+PG_VERSION="17" setup_postgresql
 fetch_and_deploy_gh_release "zipline" "diced/zipline" "tarball"
 
 msg_info "Setting up PostgreSQL"
@@ -38,7 +38,7 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC'"
 msg_ok "Set up PostgreSQL"
 
 msg_info "Installing Zipline (Patience)"
-cd /opt/zipline
+cd /opt/zipline || exit
 cat <<EOF >/opt/zipline/.env
 DATABASE_URL=postgres://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME
 CORE_SECRET=$SECRET_KEY
@@ -74,6 +74,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zitadel-install.sh b/install/zitadel-install.sh
index 5b5a84510..fcf2378ae 100644
--- a/install/zitadel-install.sh
+++ b/install/zitadel-install.sh
@@ -14,7 +14,7 @@ network_check
 update_os
 
 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y ca-certificates
+$STD apt install -y ca-certificates
 msg_ok "Installed Dependecies"
 
 PG_VERSION="17" setup_postgresql
@@ -114,7 +114,7 @@ NoNewPrivileges=true
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q zitadel
+systemctl enable -q --now zitadel
 msg_ok "Created Services"
 
 msg_info "Zitadel initial setup"
@@ -144,6 +144,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zoraxy-install.sh b/install/zoraxy-install.sh
index 5a43251de..560567052 100644
--- a/install/zoraxy-install.sh
+++ b/install/zoraxy-install.sh
@@ -37,6 +37,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zot-registry-install.sh b/install/zot-registry-install.sh
index 626d2993f..793d3b1e0 100644
--- a/install/zot-registry-install.sh
+++ b/install/zot-registry-install.sh
@@ -14,7 +14,7 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y apache2-utils
+$STD apt install -y apache2-utils
 msg_ok "Installed Dependencies"
 
 fetch_and_deploy_gh_release "zot" "project-zot/zot" "singlefile" "latest" "/usr/bin" "zot-linux-amd64"
@@ -57,6 +57,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/install/zwave-js-ui-install.sh b/install/zwave-js-ui-install.sh
index 366fdae1f..269f0fe91 100644
--- a/install/zwave-js-ui-install.sh
+++ b/install/zwave-js-ui-install.sh
@@ -46,6 +46,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"