diff --git a/.github/CONTRIBUTOR_AND_GUIDES/install/AppName-install.sh b/.github/CONTRIBUTOR_AND_GUIDES/install/AppName-install.sh
index 2eb435b16c..5210427a26 100644
--- a/.github/CONTRIBUTOR_AND_GUIDES/install/AppName-install.sh
+++ b/.github/CONTRIBUTOR_AND_GUIDES/install/AppName-install.sh
@@ -66,7 +66,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now ${APPLICATION}.service
+systemctl enable -q --now ${APPLICATION}
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh
index ad7e688464..9024d2f44b 100644
--- a/ct/homeassistant.sh
+++ b/ct/homeassistant.sh
@@ -91,7 +91,7 @@ ExecStart=/usr/local/bin/filebrowser -r /
 [Install]
 WantedBy=default.target" >$service_path
 
-    $STD systemctl enable --now filebrowser.service
+    $STD systemctl enable --now filebrowser
     msg_ok "Created Service"
 
     msg_ok "Completed Successfully!\n"
diff --git a/ct/podman-homeassistant.sh b/ct/podman-homeassistant.sh
index c42d5dc315..6c0e38dcd2 100644
--- a/ct/podman-homeassistant.sh
+++ b/ct/podman-homeassistant.sh
@@ -86,7 +86,7 @@ function update_script() {
   [Install]
     WantedBy=default.target" >$service_path
 
-    $STD systemctl enable --now filebrowser.service
+    $STD systemctl enable --now filebrowser
     msg_ok "Created Service"
 
     msg_ok "Completed Successfully!\n"
diff --git a/ct/watchyourlan.sh b/ct/watchyourlan.sh
index d2c6478475..96fc580a5f 100644
--- a/ct/watchyourlan.sh
+++ b/ct/watchyourlan.sh
@@ -36,7 +36,7 @@ function update_script() {
     cp -R config.yaml /data/config.yaml
     sed -i 's|/etc/watchyourlan/config.yaml|/data/config.yaml|' /lib/systemd/system/watchyourlan.service
     rm watchyourlan_${RELEASE}_linux_amd64.deb config.yaml
-    systemctl enable -q --now watchyourlan.service
+    systemctl enable -q --now watchyourlan
     msg_ok "Updated $APP"
     exit
 }
diff --git a/install/adguard-install.sh b/install/adguard-install.sh
index 877324d798..9d8e3b7032 100644
--- a/install/adguard-install.sh
+++ b/install/adguard-install.sh
@@ -38,7 +38,7 @@ EnvironmentFile=-/etc/sysconfig/AdGuardHome
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now AdGuardHome.service
+systemctl enable -q --now AdGuardHome
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/adventurelog-install.sh b/install/adventurelog-install.sh
index 5b1c4e6fec..94c62541a6 100644
--- a/install/adventurelog-install.sh
+++ b/install/adventurelog-install.sh
@@ -157,8 +157,8 @@ EnvironmentFile=/opt/adventurelog/frontend/.env
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now adventurelog-backend.service
-systemctl enable -q --now adventurelog-frontend.service
+systemctl enable -q --now adventurelog-backend
+systemctl enable -q --now adventurelog-frontend
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/agentdvr-install.sh b/install/agentdvr-install.sh
index f2e46f32b9..1e00e94dcb 100644
--- a/install/agentdvr-install.sh
+++ b/install/agentdvr-install.sh
@@ -48,7 +48,7 @@ RestartSec=5
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now AgentDVR.service
+systemctl enable -q --now AgentDVR
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/archivebox-install.sh b/install/archivebox-install.sh
index f0c9846e08..00ac1c8d6b 100644
--- a/install/archivebox-install.sh
+++ b/install/archivebox-install.sh
@@ -94,7 +94,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now archivebox.service
+systemctl enable -q --now archivebox
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/aria2-install.sh b/install/aria2-install.sh
index ec37e7b542..644d9660fd 100644
--- a/install/aria2-install.sh
+++ b/install/aria2-install.sh
@@ -78,7 +78,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now aria2.service
+systemctl enable -q --now aria2
 systemctl enable -q --now ariang
 msg_ok "Created Service"
 
diff --git a/install/beszel-install.sh b/install/beszel-install.sh
index 58eac82190..a2116f0007 100644
--- a/install/beszel-install.sh
+++ b/install/beszel-install.sh
@@ -34,7 +34,7 @@ RestartSec=5
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now beszel-hub.service
+systemctl enable -q --now beszel-hub
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh
index 91c5bd3d82..ff4d47dd79 100644
--- a/install/calibre-web-install.sh
+++ b/install/calibre-web-install.sh
@@ -55,7 +55,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now cps.service
+systemctl enable -q --now cps
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/cloudflared-install.sh b/install/cloudflared-install.sh
index 2022ab9068..a02c895663 100644
--- a/install/cloudflared-install.sh
+++ b/install/cloudflared-install.sh
@@ -53,7 +53,7 @@ KillMode=process
 [Install]
 WantedBy=multi-user.target
 EOF
-  systemctl enable -q --now cloudflared.service
+  systemctl enable -q --now cloudflared
   msg_ok "Created Service"
 fi
 
diff --git a/install/commafeed-install.sh b/install/commafeed-install.sh
index 9bf4ee676e..a3bc94e024 100644
--- a/install/commafeed-install.sh
+++ b/install/commafeed-install.sh
@@ -48,7 +48,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now commafeed.service
+systemctl enable -q --now commafeed
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/cosmos-install.sh b/install/cosmos-install.sh
index ae5093dbb8..c79c777e24 100644
--- a/install/cosmos-install.sh
+++ b/install/cosmos-install.sh
@@ -68,7 +68,7 @@ EnvironmentFile=-/etc/sysconfig/CosmosCloud
 WantedBy=multi-user.target
 EOF
 
-systemctl enable -q --now cosmos.service
+systemctl enable -q --now cosmos
 msg_info "Created Service"
 
 motd_ssh
diff --git a/install/dotnetaspwebapi-install.sh b/install/dotnetaspwebapi-install.sh
index 4c2e8616b5..f06db6e11b 100644
--- a/install/dotnetaspwebapi-install.sh
+++ b/install/dotnetaspwebapi-install.sh
@@ -100,7 +100,7 @@ Environment=DOTNET_NOLOGO=true
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now kestrel-aspnetapi.service
+systemctl enable -q --now kestrel-aspnetapi
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/esphome-install.sh b/install/esphome-install.sh
index 3efd1473a2..37e2d71d09 100644
--- a/install/esphome-install.sh
+++ b/install/esphome-install.sh
@@ -45,7 +45,7 @@ User=root
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now esphomeDashboard.service
+systemctl enable -q --now esphomeDashboard
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/evcc-install.sh b/install/evcc-install.sh
index 7b493b5c44..e1d4ddd091 100644
--- a/install/evcc-install.sh
+++ b/install/evcc-install.sh
@@ -28,7 +28,7 @@ msg_ok "evcc Repository setup sucessfully"
 
 msg_info "Installing evcc"
 $STD apt install -y evcc
-systemctl enable -q --now evcc.service
+systemctl enable -q --now evcc
 msg_ok "Installed evcc"
 
 motd_ssh
diff --git a/install/fileflows-install.sh b/install/fileflows-install.sh
index 612b8d67b6..c01d09f927 100644
--- a/install/fileflows-install.sh
+++ b/install/fileflows-install.sh
@@ -57,7 +57,7 @@ temp_file=$(mktemp)
 curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file"
 unzip -q -d /opt/fileflows "$temp_file"
 (cd /opt/fileflows/Server && dotnet FileFlows.Server.dll --systemd install --root true)
-systemctl enable -q --now fileflows.service
+systemctl enable -q --now fileflows
 msg_ok "Setup ${APPLICATION}"
 
 motd_ssh
diff --git a/install/flaresolverr-install.sh b/install/flaresolverr-install.sh
index f9d99e3152..8e18043f88 100644
--- a/install/flaresolverr-install.sh
+++ b/install/flaresolverr-install.sh
@@ -53,7 +53,7 @@ TimeoutStopSec=30
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now flaresolverr.service
+systemctl enable -q --now flaresolverr
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/flowiseai-install.sh b/install/flowiseai-install.sh
index 2dfde48064..a0ebe92a50 100644
--- a/install/flowiseai-install.sh
+++ b/install/flowiseai-install.sh
@@ -49,7 +49,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now flowise.service
+systemctl enable -q --now flowise
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/fluid-calendar-install.sh b/install/fluid-calendar-install.sh
index c1dc64ab00..0b1a546436 100644
--- a/install/fluid-calendar-install.sh
+++ b/install/fluid-calendar-install.sh
@@ -89,7 +89,7 @@ ExecStart=/usr/bin/npm run start
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now fluid-calendar.service
+systemctl enable -q --now fluid-calendar
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/glance-install.sh b/install/glance-install.sh
index 88841a596c..cb1b9669f5 100644
--- a/install/glance-install.sh
+++ b/install/glance-install.sh
@@ -60,7 +60,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target" >$service_path
 
-systemctl enable -q --now glance.service
+systemctl enable -q --now glance
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/grist-install.sh b/install/grist-install.sh
index bc15e03261..079a4242a8 100644
--- a/install/grist-install.sh
+++ b/install/grist-install.sh
@@ -66,7 +66,7 @@ EnvironmentFile=-/opt/grist/.env
 WantedBy=multi-user.target
 EOF
 
-systemctl enable -q --now grist.service
+systemctl enable -q --now grist
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/heimdall-dashboard-install.sh b/install/heimdall-dashboard-install.sh
index f1feb68731..50ef7f6b6b 100644
--- a/install/heimdall-dashboard-install.sh
+++ b/install/heimdall-dashboard-install.sh
@@ -49,8 +49,8 @@ TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target" >$service_path
-systemctl enable -q --now heimdall.service
-cd /opt/Heimdall || exit
+systemctl enable -q --now heimdall
+cd /opt/Heimdall
 COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload &>/dev/null
 systemctl restart heimdall.service
 msg_ok "Created Service"
diff --git a/install/hev-socks5-server-install.sh b/install/hev-socks5-server-install.sh
index 8600442f29..241f161100 100644
--- a/install/hev-socks5-server-install.sh
+++ b/install/hev-socks5-server-install.sh
@@ -42,7 +42,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now ${APPLICATION}.service
+systemctl enable -q --now ${APPLICATION}
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/hoarder-install.sh b/install/hoarder-install.sh
index 0ec48bedaf..6c079f9fb2 100644
--- a/install/hoarder-install.sh
+++ b/install/hoarder-install.sh
@@ -168,7 +168,7 @@ TimeoutStopSec=5
 WantedBy=multi-user.target
 EOF
 
-systemctl -q enable --now meilisearch.service hoarder-browser.service hoarder-workers.service hoarder-web.service
+systemctl enable -q --now meilisearch hoarder-browser hoarder-workers hoarder-web
 msg_ok "Created Services"
 
 motd_ssh
diff --git a/install/homebox-install.sh b/install/homebox-install.sh
index 2e33618897..ba42195abf 100644
--- a/install/homebox-install.sh
+++ b/install/homebox-install.sh
@@ -42,7 +42,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now homebox.service
+systemctl enable -q --now homebox
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/hyperion-install.sh b/install/hyperion-install.sh
index 495234ed7e..ab0141bc25 100644
--- a/install/hyperion-install.sh
+++ b/install/hyperion-install.sh
@@ -26,7 +26,7 @@ curl -fsSL "https://releases.hyperion-project.org/hyperion.pub.key" | gpg --dear
 echo "deb [signed-by=/usr/share/keyrings/hyperion.pub.gpg] https://apt.releases.hyperion-project.org/ $(lsb_release -cs) main" >/etc/apt/sources.list.d/hyperion.list
 $STD apt-get update
 $STD apt-get install -y hyperion
-$STD systemctl enable --now hyperion@root.service
+$STD systemctl enable --now hyperion@root
 msg_ok "Installed Hyperion"
 
 motd_ssh
diff --git a/install/iventoy-install.sh b/install/iventoy-install.sh
index 20d4692219..b939b55fa6 100644
--- a/install/iventoy-install.sh
+++ b/install/iventoy-install.sh
@@ -40,7 +40,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now iventoy.service
+systemctl enable -q --now iventoy
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/jackett-install.sh b/install/jackett-install.sh
index 8501842dd8..6cff1bd92f 100644
--- a/install/jackett-install.sh
+++ b/install/jackett-install.sh
@@ -38,7 +38,7 @@ Environment="DisableRootWarning=true"
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now jackett.service
+systemctl enable -q --now jackett
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/jellyseerr-install.sh b/install/jellyseerr-install.sh
index c7966c185e..bb855b3793 100644
--- a/install/jellyseerr-install.sh
+++ b/install/jellyseerr-install.sh
@@ -69,7 +69,7 @@ ExecStart=/usr/bin/node dist/index.js
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now jellyseerr.service
+systemctl enable -q --now jellyseerr
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/linkwarden-install.sh b/install/linkwarden-install.sh
index 03e1aaa2d0..1832e6e759 100644
--- a/install/linkwarden-install.sh
+++ b/install/linkwarden-install.sh
@@ -126,7 +126,7 @@ ExecStart=/usr/bin/yarn start
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now linkwarden.service
+systemctl enable -q --now linkwarden
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/matterbridge-install.sh b/install/matterbridge-install.sh
index 44e102befe..de1f56bc6a 100644
--- a/install/matterbridge-install.sh
+++ b/install/matterbridge-install.sh
@@ -53,7 +53,7 @@ TimeoutStopSec=30s
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now matterbridge.service
+systemctl enable -q --now matterbridge
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/mattermost-install.sh b/install/mattermost-install.sh
index 671aea6409..6bf04627a9 100644
--- a/install/mattermost-install.sh
+++ b/install/mattermost-install.sh
@@ -45,7 +45,7 @@ $STD apt-get install -y mattermost
 $STD install -C -m 600 -o mattermost -g mattermost /opt/mattermost/config/config.defaults.json /opt/mattermost/config/config.json
 sed -i -e "/DataSource/c\   \"DataSource\": \"postgres://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME?sslmode=disable&connect_timeout=10\"," \
   -e "/SiteURL/c\   \"SiteURL\": \"http://$IPADDRESS:8065\"," /opt/mattermost/config/config.json
-systemctl enable -q --now mattermost.service
+systemctl enable -q --now mattermost
 msg_ok "Installed Mattermost"
 
 motd_ssh
diff --git a/install/mediamtx-install.sh b/install/mediamtx-install.sh
index a7dabb90e2..b93476f19e 100644
--- a/install/mediamtx-install.sh
+++ b/install/mediamtx-install.sh
@@ -40,7 +40,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now mediamtx.service
+systemctl enable -q --now mediamtx
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/medusa-install.sh b/install/medusa-install.sh
index 8dfaf24301..399cf9a51a 100644
--- a/install/medusa-install.sh
+++ b/install/medusa-install.sh
@@ -48,7 +48,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now medusa.service
+systemctl enable -q --now medusa
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/memos-install.sh b/install/memos-install.sh
index 26cc16013f..9f2b3e1362 100644
--- a/install/memos-install.sh
+++ b/install/memos-install.sh
@@ -78,7 +78,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now memos.service
+systemctl enable -q --now memos
 msg_ok "Created Service"
 
 motd_ssh
@@ -87,4 +87,4 @@ customize
 msg_info "Cleaning up"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-msg_ok "Cleaned"
\ No newline at end of file
+msg_ok "Cleaned"
diff --git a/install/metube-install.sh b/install/metube-install.sh
index 5e07c68a9b..68428941e5 100644
--- a/install/metube-install.sh
+++ b/install/metube-install.sh
@@ -82,7 +82,7 @@ User=root
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now metube.service
+systemctl enable -q --now metube
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/mongodb-install.sh b/install/mongodb-install.sh
index 3bb8fc7043..5e1abad175 100644
--- a/install/mongodb-install.sh
+++ b/install/mongodb-install.sh
@@ -30,7 +30,7 @@ echo "deb [signed-by=/usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg]
 $STD apt-get update
 $STD apt-get install -y mongodb-org
 sed -i 's/bindIp: 127.0.0.1/bindIp: 0.0.0.0/' /etc/mongod.conf
-systemctl enable -q --now mongod.service
+systemctl enable -q --now mongod
 msg_ok "Installed MongoDB $MONGODB_VERSION"
 
 motd_ssh
diff --git a/install/mylar3-install.sh b/install/mylar3-install.sh
index e5477752b4..cab578fbb2 100644
--- a/install/mylar3-install.sh
+++ b/install/mylar3-install.sh
@@ -51,7 +51,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now mylar3.service
+systemctl enable -q --now mylar3
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/myspeed-install.sh b/install/myspeed-install.sh
index 134ed7cbcf..c440421066 100644
--- a/install/myspeed-install.sh
+++ b/install/myspeed-install.sh
@@ -16,9 +16,6 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   build-essential \
-  g++ \
-  make \
-  make \
   gpg \
   ca-certificates
 msg_ok "Installed Dependencies"
@@ -61,7 +58,7 @@ WorkingDirectory=/opt/myspeed
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now myspeed.service
+systemctl enable -q --now myspeed
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/n8n-install.sh b/install/n8n-install.sh
index 9445f57906..b8cebc0971 100644
--- a/install/n8n-install.sh
+++ b/install/n8n-install.sh
@@ -14,8 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  ca-certificates \
+  gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
diff --git a/install/navidrome-install.sh b/install/navidrome-install.sh
index cbd55a6b59..04c4af0b90 100644
--- a/install/navidrome-install.sh
+++ b/install/navidrome-install.sh
@@ -65,7 +65,7 @@ ProtectSystem=full
 [Install]
 WantedBy=multi-user.target" >$service_path
 systemctl daemon-reload
-$STD systemctl enable --now navidrome.service
+systemctl enable -q --now navidrome
 
 msg_ok "Created Service"
 
diff --git a/install/netbox-install.sh b/install/netbox-install.sh
index 192747e85d..89ec24dd70 100644
--- a/install/netbox-install.sh
+++ b/install/netbox-install.sh
@@ -18,10 +18,6 @@ $STD apt-get install -y \
   apache2 \
   redis-server \
   postgresql \
-  python3 \
-  python3-pip \
-  python3-venv \
-  python3-dev \
   build-essential \
   libxml2-dev \
   libxslt1-dev \
@@ -31,6 +27,14 @@ $STD apt-get install -y \
   zlib1g-dev
 msg_ok "Installed Dependencies"
 
+msg_info "Installing Python"
+$STD apt-get install -y \
+  python3 \
+  python3-pip \
+  python3-venv \
+  python3-dev
+msg_ok "Installed Python"  
+
 msg_info "Setting up PostgreSQL"
 DB_NAME=netbox
 DB_USER=netbox
diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh
index a869f7f885..02f02945e3 100644
--- a/install/nginxproxymanager-install.sh
+++ b/install/nginxproxymanager-install.sh
@@ -17,9 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get update
 $STD apt-get -y install \
   gnupg \
-  make \
-  gcc \
-  g++ \
   ca-certificates \
   apache2-utils \
   logrotate \
diff --git a/install/nocodb-install.sh b/install/nocodb-install.sh
index a16e05a091..a901609cf9 100644
--- a/install/nocodb-install.sh
+++ b/install/nocodb-install.sh
@@ -34,7 +34,7 @@ ExecStart=/opt/nocodb/./nocodb
 
 [Install]
 WantedBy=multi-user.target" >$service_path
-systemctl enable -q --now nocodb.service &>/dev/null
+systemctl enable -q --now nocodb
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/node-red-install.sh b/install/node-red-install.sh
index 6bf096e150..ec8ca6575f 100644
--- a/install/node-red-install.sh
+++ b/install/node-red-install.sh
@@ -14,9 +14,10 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y git
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  git \
+  ca-certificates \
+  gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
@@ -62,7 +63,7 @@ Group=root
 
 [Install]
 WantedBy=multi-user.target" >$service_path
-$STD systemctl enable --now nodered.service
+systemctl enable -q --now nodered
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/nodebb-install.sh b/install/nodebb-install.sh
index 862b2dbc22..823cc93315 100644
--- a/install/nodebb-install.sh
+++ b/install/nodebb-install.sh
@@ -16,7 +16,6 @@ update_os
 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y \
     build-essential \
-    make \
     redis-server \
     expect \
     gnupg \
diff --git a/install/ntfy-install.sh b/install/ntfy-install.sh
index 477e8c4f03..25bc708746 100644
--- a/install/ntfy-install.sh
+++ b/install/ntfy-install.sh
@@ -14,8 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y gpg
-$STD apt-get install -y apt-transport-https
+$STD apt-get install -y \
+  gpg \
+  apt-transport-https
 msg_ok "Installed Dependencies"
 
 msg_info "Installing ntfy"
diff --git a/install/nzbget-install.sh b/install/nzbget-install.sh
index 18211287a3..72d23eff8e 100644
--- a/install/nzbget-install.sh
+++ b/install/nzbget-install.sh
@@ -15,8 +15,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y gpg
-$STD apt-get install -y par2
+$STD apt-get install -y \
+  gpg \
+  par2
 
 cat <<EOF >/etc/apt/sources.list.d/non-free.list
 deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
diff --git a/install/octoprint-install.sh b/install/octoprint-install.sh
index d13c8f837e..a4924ce195 100644
--- a/install/octoprint-install.sh
+++ b/install/octoprint-install.sh
@@ -14,9 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y git
-$STD apt-get install -y libyaml-dev
-$STD apt-get install -y build-essential
+$STD apt-get install -y git \
+  libyaml-dev \
+  build-essential
 msg_ok "Installed Dependencies"
 
 msg_info "Setup Python3"
@@ -24,9 +24,8 @@ $STD apt-get install -y \
   python3 \
   python3-dev \
   python3-pip \
-  python3-venv
-
-$STD apt-get install -y python3-setuptools
+  python3-venv \
+  python3-setuptools
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Setup Python3"
 
@@ -66,7 +65,7 @@ ExecStart=/opt/octoprint/bin/octoprint serve
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now octoprint.service
+systemctl enable -q --now octoprint
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/ollama-install.sh b/install/ollama-install.sh
index ff093aa950..fd0baacd5e 100644
--- a/install/ollama-install.sh
+++ b/install/ollama-install.sh
@@ -15,11 +15,12 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y gpg
-$STD apt-get install -y git
-$STD apt-get install -y build-essential
-$STD apt-get install -y pkg-config
-$STD apt-get install -y cmake
+$STD apt-get install -y \
+  gpg \
+  git \
+  build-essential \
+  pkg-config \
+  cmake
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Golang"
@@ -85,7 +86,7 @@ RestartSec=3
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now ollama.service
+systemctl enable -q --now ollama
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/ombi-install.sh b/install/ombi-install.sh
index 995b3b09b3..2ae4855a2a 100644
--- a/install/ombi-install.sh
+++ b/install/ombi-install.sh
@@ -36,7 +36,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now ombi.service
+systemctl enable -q --now ombi
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/opengist-install.sh b/install/opengist-install.sh
index 68b35e66ac..8c9f991b54 100644
--- a/install/opengist-install.sh
+++ b/install/opengist-install.sh
@@ -45,7 +45,7 @@ User=root
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now opengist.service
+systemctl enable -q --now opengist
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/openhab-install.sh b/install/openhab-install.sh
index 3a834d766e..c94a443196 100644
--- a/install/openhab-install.sh
+++ b/install/openhab-install.sh
@@ -14,8 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y gnupg
-$STD apt-get install -y apt-transport-https
+$STD apt-get install -y \
+  gnupg \
+  apt-transport-https
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Azul Zulu21"
@@ -34,7 +35,7 @@ echo "deb [signed-by=/usr/share/keyrings/openhab.gpg] https://openhab.jfrog.io/a
 $STD apt update
 $STD apt-get -y install openhab
 systemctl daemon-reload
-systemctl enable -q --now openhab.service
+systemctl enable -q --now openhab
 msg_ok "Installed openHAB"
 
 motd_ssh
diff --git a/install/openwebui-install.sh b/install/openwebui-install.sh
index 580d2252ed..fa27ce8a9c 100644
--- a/install/openwebui-install.sh
+++ b/install/openwebui-install.sh
@@ -77,7 +77,7 @@ RestartSec=3
 [Install]
 WantedBy=multi-user.target
 EOF
-  systemctl enable -q --now ollama.service
+  systemctl enable -q --now ollama
   sed -i 's/ENABLE_OLLAMA_API=false/ENABLE_OLLAMA_API=true/g' /opt/open-webui/.env
   msg_ok "Installed Ollama"
 fi
@@ -97,7 +97,7 @@ ExecStart=/opt/open-webui/backend/start.sh
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now open-webui.service
+systemctl enable -q --now open-webui
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/overseerr-install.sh b/install/overseerr-install.sh
index 7459e3bf4b..98ebb9890f 100644
--- a/install/overseerr-install.sh
+++ b/install/overseerr-install.sh
@@ -14,9 +14,10 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y git
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  git \
+  ca-certificates \
+  gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
@@ -55,7 +56,7 @@ ExecStart=/usr/bin/yarn start
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now overseerr.service
+systemctl enable -q --now overseerr
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/owncast-install.sh b/install/owncast-install.sh
index 6e8a389551..4976f296c7 100644
--- a/install/owncast-install.sh
+++ b/install/owncast-install.sh
@@ -39,7 +39,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now owncast.service
+systemctl enable -q --now owncast
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/pairdrop-install.sh b/install/pairdrop-install.sh
index e0c338e71f..a5d41f926d 100644
--- a/install/pairdrop-install.sh
+++ b/install/pairdrop-install.sh
@@ -14,8 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y git
-$STD apt-get install -y gpg
+$STD apt-get install -y \
+  git \
+  gpg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
@@ -49,7 +50,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now pairdrop.service
+systemctl enable -q --now pairdrop
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/paperless-ai-install.sh b/install/paperless-ai-install.sh
index 95a223ba87..bdd0b6a7ff 100644
--- a/install/paperless-ai-install.sh
+++ b/install/paperless-ai-install.sh
@@ -16,9 +16,6 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   gpg \
-  make \
-  gcc \
-  g++ \
   build-essential
 msg_ok "Installed Dependencies"
 
@@ -82,7 +79,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now paperless-ai.service
+systemctl enable -q --now paperless-ai
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/paymenter-install.sh b/install/paymenter-install.sh
index d0f090b82a..642e0681fb 100644
--- a/install/paymenter-install.sh
+++ b/install/paymenter-install.sh
@@ -47,10 +47,10 @@ mysql -u root -e "CREATE DATABASE $DB_NAME;"
 mysql -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
 mysql -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost' WITH GRANT OPTION;"
 {
-    echo "Paymenter Database Credentials"
-    echo "Database: $DB_NAME"
-    echo "Username: $DB_USER"
-    echo "Password: $DB_PASS"
+  echo "Paymenter Database Credentials"
+  echo "Database: $DB_NAME"
+  echo "Username: $DB_USER"
+  echo "Password: $DB_PASS"
 } >>~/paymenter_db.creds
 cp .env.example .env
 $STD composer install --no-dev --optimize-autoloader --no-interaction
@@ -125,7 +125,7 @@ RestartSec=5s
 [Install]
 WantedBy=multi-user.target
 EOF
-$STD systemctl enable --now paymenter.service
+$STD systemctl enable --now paymenter
 msg_ok "Setup Service"
 
 msg_info "Cleaning up"
diff --git a/install/peanut-install.sh b/install/peanut-install.sh
index f1fb4a8d96..d319afab8a 100644
--- a/install/peanut-install.sh
+++ b/install/peanut-install.sh
@@ -73,7 +73,7 @@ TimeoutStopSec=30
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now peanut.service
+systemctl enable -q --now peanut
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/pelican-panel-install.sh b/install/pelican-panel-install.sh
index 8ec8136ed0..c081c2726d 100644
--- a/install/pelican-panel-install.sh
+++ b/install/pelican-panel-install.sh
@@ -23,7 +23,7 @@ $STD apt-get install -y \
 msg_ok "Installed Dependencies"
 
 msg_info "Adding PHP8.3 Repository"
-$STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+$STD curl -fsSL "https://packages.sury.org/debsuryorg-archive-keyring.deb" -o /tmp/debsuryorg-archive-keyring.deb
 $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
 $STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 $STD apt-get update
diff --git a/install/petio-install.sh b/install/petio-install.sh
index faaaadc494..41aaabb6cd 100644
--- a/install/petio-install.sh
+++ b/install/petio-install.sh
@@ -31,7 +31,7 @@ fi
 $STD apt-get update
 $STD apt-get install -y mongodb-org
 sed -i 's/bindIp: 127.0.0.1/bindIp: 0.0.0.0/' /etc/mongod.conf
-systemctl enable -q --now mongod.service
+systemctl enable -q --now mongod
 msg_ok "MongoDB 4.4 Installed"
 
 msg_info "Installing Petio"
@@ -61,7 +61,7 @@ WantedBy=multi-user.target
 
 
 EOF
-systemctl enable -q --now petio.service
+systemctl enable -q --now petio
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/pocketbase-install.sh b/install/pocketbase-install.sh
index f35bcf5e7e..295f1e6edd 100644
--- a/install/pocketbase-install.sh
+++ b/install/pocketbase-install.sh
@@ -36,7 +36,7 @@ ExecStart      = /opt/pocketbase/pocketbase serve --http=0.0.0.0:8080
 WantedBy = multi-user.target
 EOF
 
-systemctl enable -q --now pocketbase.service
+systemctl enable -q --now pocketbase
 msg_ok "Installed Pocketbase"
 
 motd_ssh
diff --git a/install/readeck-install.sh b/install/readeck-install.sh
index edc3b5503d..292e1a8a16 100644
--- a/install/readeck-install.sh
+++ b/install/readeck-install.sh
@@ -37,7 +37,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now readeck.service
+systemctl enable -q --now readeck
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/redis-install.sh b/install/redis-install.sh
index 15389fba3d..45ea6700c5 100644
--- a/install/redis-install.sh
+++ b/install/redis-install.sh
@@ -25,7 +25,7 @@ echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://pack
 $STD apt-get update
 $STD apt-get install -y redis
 sed -i 's/^bind .*/bind 0.0.0.0/' /etc/redis/redis.conf
-systemctl enable -q --now redis-server.service
+systemctl enable -q --now redis-server
 msg_ok "Installed Redis"
 
 motd_ssh
diff --git a/install/slskd-install.sh b/install/slskd-install.sh
index f8dc06648f..bdf4d2e45a 100644
--- a/install/slskd-install.sh
+++ b/install/slskd-install.sh
@@ -105,7 +105,7 @@ ExecStart=/bin/bash -c /opt/soularr/run.sh
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now ${APPLICATION}.service
+systemctl enable -q --now ${APPLICATION}
 systemctl enable -q soularr.timer
 msg_ok "Created Services"
 
diff --git a/install/spoolman-install.sh b/install/spoolman-install.sh
index c3be0d760f..0bb841f0cd 100644
--- a/install/spoolman-install.sh
+++ b/install/spoolman-install.sh
@@ -58,7 +58,7 @@ User=root
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now spoolman.service
+systemctl enable -q --now spoolman
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/threadfin-install.sh b/install/threadfin-install.sh
index 5951993e7a..5e4b92a6de 100644
--- a/install/threadfin-install.sh
+++ b/install/threadfin-install.sh
@@ -40,7 +40,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now threadfin.service
+systemctl enable -q --now threadfin
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/tianji-install.sh b/install/tianji-install.sh
index 44935ddc73..ab12e2621a 100644
--- a/install/tianji-install.sh
+++ b/install/tianji-install.sh
@@ -94,7 +94,7 @@ Environment=NODE_ENV=production
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now tianji.service
+systemctl enable -q --now tianji
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/traefik-install.sh b/install/traefik-install.sh
index 6701ec41d6..7cc2b00f4d 100644
--- a/install/traefik-install.sh
+++ b/install/traefik-install.sh
@@ -99,7 +99,7 @@ ExecReload=/bin/kill -USR1 \$MAINPID
 WantedBy=multi-user.target
 EOF
 
-systemctl enable -q --now traefik.service
+systemctl enable -q --now traefik
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/umami-install.sh b/install/umami-install.sh
index f3c1118e16..5733f04674 100644
--- a/install/umami-install.sh
+++ b/install/umami-install.sh
@@ -72,7 +72,7 @@ ExecStart=/usr/bin/yarn run start
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now umami.service
+systemctl enable -q --now umami
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/umbrel-install.sh b/install/umbrel-install.sh
index edf457530e..3855b11179 100644
--- a/install/umbrel-install.sh
+++ b/install/umbrel-install.sh
@@ -19,7 +19,7 @@ mkdir -p $(dirname $DOCKER_CONFIG_PATH)
 echo -e '{\n  "log-driver": "journald"\n}' >/etc/docker/daemon.json
 $STD bash <(curl -fsSL https://umbrel.sh)
 systemctl daemon-reload
-$STD systemctl enable --now umbrel-startup.service
+$STD systemctl enable --now umbrel-startup
 msg_ok "Installed Umbrel"
 
 motd_ssh
diff --git a/install/uptimekuma-install.sh b/install/uptimekuma-install.sh
index 8cd8a84e11..a869d165e5 100644
--- a/install/uptimekuma-install.sh
+++ b/install/uptimekuma-install.sh
@@ -51,7 +51,7 @@ ExecStart=/usr/bin/npm start
 
 [Install]
 WantedBy=multi-user.target" >$service_path
-$STD systemctl enable --now uptime-kuma.service
+$STD systemctl enable --now uptime-kuma
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/vaultwarden-install.sh b/install/vaultwarden-install.sh
index b50e7b6c4e..9f31292ed0 100644
--- a/install/vaultwarden-install.sh
+++ b/install/vaultwarden-install.sh
@@ -104,7 +104,7 @@ AmbientCapabilities=CAP_NET_BIND_SERVICE
 [Install]
 WantedBy=multi-user.target" >$service_path
 systemctl daemon-reload
-$STD systemctl enable --now vaultwarden.service
+$STD systemctl enable --now vaultwarden
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/watchyourlan-install.sh b/install/watchyourlan-install.sh
index 1306adf2b6..a307fc63e6 100644
--- a/install/watchyourlan-install.sh
+++ b/install/watchyourlan-install.sh
@@ -45,7 +45,7 @@ msg_ok "Installed WatchYourLAN"
 
 msg_info "Creating Service"
 sed -i 's|/etc/watchyourlan/config.yaml|/data/config.yaml|' /lib/systemd/system/watchyourlan.service
-systemctl enable -q --now watchyourlan.service
+systemctl enable -q --now watchyourlan
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/whoogle-install.sh b/install/whoogle-install.sh
index e20dfcd611..ea4cff23ee 100644
--- a/install/whoogle-install.sh
+++ b/install/whoogle-install.sh
@@ -36,7 +36,7 @@ User=root
 [Install]
 WantedBy=multi-user.target" >$service_path
 
-$STD systemctl enable --now whoogle.service
+$STD systemctl enable --now whoogle
 msg_ok "Installed Whoogle"
 
 motd_ssh
diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh
index 6e4b2048af..47cc24f0fc 100644
--- a/install/wireguard-install.sh
+++ b/install/wireguard-install.sh
@@ -66,7 +66,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now wg-dashboard.service
+systemctl enable -q --now wg-dashboard
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/zigbee2mqtt-install.sh b/install/zigbee2mqtt-install.sh
index 04da3e9a7e..c3e21c8554 100644
--- a/install/zigbee2mqtt-install.sh
+++ b/install/zigbee2mqtt-install.sh
@@ -67,7 +67,7 @@ User=root
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now zigbee2mqtt.service
+systemctl enable -q --now zigbee2mqtt
 msg_ok "Created Service"
 
 motd_ssh
diff --git a/install/zoraxy-install.sh b/install/zoraxy-install.sh
index 94697047fe..8a3c93b445 100644
--- a/install/zoraxy-install.sh
+++ b/install/zoraxy-install.sh
@@ -37,7 +37,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now zoraxy.service
+systemctl enable -q --now zoraxy
 msg_ok "Created Service"
 
 motd_ssh