diff --git a/ct/guardian.sh b/ct/guardian.sh
index 0028bf3e..2a9a8c15 100644
--- a/ct/guardian.sh
+++ b/ct/guardian.sh
@@ -24,43 +24,37 @@ function update_script() {
   check_container_storage
   check_container_resources
 
-  # Check if installation is present | -f for file, -d for folder
   if [[ ! -d "/opt/${APP}" ]]; then
     msg_error "No ${APP} Installation Found!"
     exit
   fi
 
-  # Crawling the new version and checking whether an update is required
+
   RELEASE=$(curl -fsSL https://api.github.com/repos/HydroshieldMKII/Guardian/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
   if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
-    # Stopping Services
+
     msg_info "Stopping $APP"
     systemctl stop guardian-backend guardian-frontend
     msg_ok "Stopped $APP"
 
-    # Creating Backup
-    msg_info "Creating Backup"
-    tar -czf "/opt/${APP}_backup_$(date +%F).tar.gz" /opt/Guardian
-    msg_ok "Backup Created"
 
-    # Preserve Database
     msg_info "Preserving Database"
     if [[ -f "/opt/Guardian/backend/plex-guard.db" ]]; then
       cp "/opt/Guardian/backend/plex-guard.db" "/tmp/plex-guard.db.backup"
       msg_ok "Database backed up"
     fi
 
-    # Execute Update
+
     msg_info "Updating $APP to v${RELEASE}"
     cd /tmp
+
     curl -fsSL -o "${RELEASE}.zip" "https://github.com/HydroshieldMKII/Guardian/archive/refs/tags/${RELEASE}.zip"
     unzip -q "${RELEASE}.zip"
     rm -rf /opt/Guardian
-    # Strip 'v' prefix from RELEASE for folder name
+
     FOLDER_NAME=$(echo "${RELEASE}" | sed 's/^v//')
     mv "Guardian-${FOLDER_NAME}/" "/opt/Guardian"
 
-    # Restore Database
     if [[ -f "/tmp/plex-guard.db.backup" ]]; then
       msg_info "Restoring Database"
       cp "/tmp/plex-guard.db.backup" "/opt/Guardian/backend/plex-guard.db"
@@ -68,25 +62,21 @@ function update_script() {
       msg_ok "Database restored"
     fi
 
-    # Build Backend
     cd /opt/Guardian/backend
     npm ci
     npm run build
 
-    # Build Frontend
     cd /opt/Guardian/frontend
     npm ci
-    npm run build
+    NODE_ENV=development npm run build
 
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
-    # Starting Services
     msg_info "Starting $APP"
     systemctl start guardian-backend guardian-frontend
     msg_ok "Started $APP"
 
-    # Cleaning up
     msg_info "Cleaning Up"
     rm -rf /tmp/"${RELEASE}.zip" /tmp/"Guardian-${FOLDER_NAME}" /tmp/plex-guard.db.backup
     msg_ok "Cleanup Completed"
diff --git a/install/guardian-install.sh b/install/guardian-install.sh
index c13645ee..06d547b0 100644
--- a/install/guardian-install.sh
+++ b/install/guardian-install.sh
@@ -5,7 +5,6 @@
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://github.com/HydroshieldMKII/Guardian
 
-# Import Functions und Setup
 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
 verb_ip6
@@ -14,7 +13,6 @@ setting_up_container
 network_check
 update_os
 
-# Installing Dependencies
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   git \
@@ -25,31 +23,30 @@ $STD apt-get install -y \
   curl
 msg_ok "Installed Dependencies"
 
-# Setup App
 msg_info "Setup Guardian"
 RELEASE=$(curl -fsSL https://api.github.com/repos/HydroshieldMKII/Guardian/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 curl -fsSL -o "${RELEASE}.zip" "https://github.com/HydroshieldMKII/Guardian/archive/refs/tags/${RELEASE}.zip"
 unzip -q "${RELEASE}.zip"
-# Strip 'v' prefix from RELEASE for folder name
+
 FOLDER_NAME=$(echo "${RELEASE}" | sed 's/^v//')
 mv "Guardian-${FOLDER_NAME}/" "/opt/Guardian"
+
 echo "${RELEASE}" >/opt/Guardian_version.txt
 msg_ok "Setup Guardian"
 
-# ===== Build Backend =====
+
 msg_info "Building backend"
 cd /opt/Guardian/backend
 npm ci
 npm run build
 msg_ok "Built backend"
 
-# ===== Install Frontend Dependencies =====
-msg_info "Installing frontend dependencies"
+msg_info "Building frontend"
 cd /opt/Guardian/frontend
 npm ci
-msg_ok "Installed frontend dependencies"
+NODE_ENV=development npm run build
+msg_ok "Built frontend"
 
-# ===== Backend Service =====
 msg_info "Creating Backend Service"
 cat <<EOF >/etc/systemd/system/guardian-backend.service
 [Unit]
@@ -69,7 +66,6 @@ EOF
 systemctl enable -q --now guardian-backend
 msg_ok "Created Backend Service"
 
-# ===== Frontend Service =====
 msg_info "Creating Frontend Service"
 cat <<EOF >/etc/systemd/system/guardian-frontend.service
 [Unit]
@@ -79,9 +75,9 @@ Wants=guardian-backend.service
 
 [Service]
 WorkingDirectory=/opt/Guardian/frontend
-Environment=NODE_ENV=development
+Environment=NODE_ENV=production
 Environment=PORT=3000
-ExecStart=/usr/bin/npm run dev
+ExecStart=/usr/bin/npm run start
 Restart=always
 RestartSec=3