diff --git a/backend/src/routes/updates.rs b/backend/src/routes/updates.rs
index b287db7d..bdf8e004 100644
--- a/backend/src/routes/updates.rs
+++ b/backend/src/routes/updates.rs
@@ -7,9 +7,19 @@ use axum::{
 };
 use serde::{Deserialize, Serialize};
 use std::process::Command;
+use tokio::fs;
 
 use crate::AppState;
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct UpdateStatus {
+    pub status: String,
+    pub message: String,
+    pub progress: u8,
+    pub version: Option<String>,
+    pub timestamp: Option<String>,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct VersionInfo {
     pub current_version: String,
@@ -106,6 +116,43 @@ pub async fn check_updates(State(_state): State<AppState>) -> Result<Json<Versio
     }))
 }
 
+/// Get update status
+#[utoipa::path(
+    get,
+    path = "/api/updates/status",
+    responses(
+        (status = 200, description = "Update status retrieved successfully", body = UpdateStatus),
+        (status = 404, description = "No update in progress"),
+        (status = 500, description = "Failed to read status")
+    ),
+    tag = "Updates"
+)]
+pub async fn get_update_status(
+    State(_state): State<AppState>,
+) -> Result<Json<UpdateStatus>, AppError> {
+    let status_file = "/tmp/csf-core-update-status.json";
+
+    match tokio::fs::read_to_string(status_file).await {
+        Ok(content) => match serde_json::from_str::<UpdateStatus>(&content) {
+            Ok(status) => Ok(Json(status)),
+            Err(e) => Err(AppError::InternalError(format!(
+                "Failed to parse status file: {}",
+                e
+            ))),
+        },
+        Err(_) => {
+            // No status file means no update in progress
+            Ok(Json(UpdateStatus {
+                status: "idle".to_string(),
+                message: "No update in progress".to_string(),
+                progress: 0,
+                version: None,
+                timestamp: None,
+            }))
+        }
+    }
+}
+
 /// Trigger update installation
 #[utoipa::path(
     post,
@@ -312,6 +359,7 @@ impl IntoResponse for AppError {
 pub fn router() -> Router<AppState> {
     Router::new()
         .route("/updates/check", get(check_updates))
+        .route("/updates/status", get(get_update_status))
         .route("/updates/install", post(install_update))
         .route("/updates/changelog/:version", get(get_changelog))
 }
diff --git a/frontend/src/lib/components/UpdateScreen.svelte b/frontend/src/lib/components/UpdateScreen.svelte
new file mode 100644
index 00000000..0cff8f9c
--- /dev/null
+++ b/frontend/src/lib/components/UpdateScreen.svelte
@@ -0,0 +1,202 @@
+<script lang="ts">
+  import { onMount, onDestroy } from 'svelte';
+  import { fade } from 'svelte/transition';
+  import { Progress } from '$lib/components/ui/progress';
+  import Logo from '$lib/assets/logo.svg';
+
+  let updateStatus = $state({
+    status: 'idle',
+    message: 'Initializing update...',
+    progress: 0,
+    version: '',
+    timestamp: '',
+  });
+
+  let logs: string[] = $state([]);
+  let logsContainer: HTMLDivElement;
+  let pollInterval: number;
+
+  async function fetchUpdateStatus() {
+    try {
+      const response = await fetch('/api/updates/status');
+      if (response.ok) {
+        const data = await response.json();
+
+        // Only add to logs if message changed
+        if (data.message !== updateStatus.message) {
+          logs = [...logs, `${new Date().toLocaleTimeString()}: ${data.message}`];
+
+          // Auto-scroll to bottom
+          setTimeout(() => {
+            if (logsContainer) {
+              logsContainer.scrollTop = logsContainer.scrollHeight;
+            }
+          }, 10);
+        }
+
+        updateStatus = data;
+
+        // If update is completed or error, stop polling
+        if (data.status === 'completed') {
+          setTimeout(() => {
+            // Reload the page after 2 seconds
+            window.location.reload();
+          }, 2000);
+        } else if (data.status === 'error') {
+          // Stop polling on error
+          if (pollInterval) {
+            clearInterval(pollInterval);
+          }
+        }
+      }
+    } catch (error) {
+      console.error('Failed to fetch update status:', error);
+    }
+  }
+
+  onMount(() => {
+    // Initial fetch
+    fetchUpdateStatus();
+
+    // Poll every second
+    pollInterval = setInterval(fetchUpdateStatus, 1000);
+  });
+
+  onDestroy(() => {
+    if (pollInterval) {
+      clearInterval(pollInterval);
+    }
+  });
+
+  function getStatusColor() {
+    switch (updateStatus.status) {
+      case 'completed':
+        return 'text-green-500';
+      case 'error':
+        return 'text-red-500';
+      case 'in_progress':
+        return 'text-blue-500';
+      default:
+        return 'text-gray-500';
+    }
+  }
+
+  function getStatusIcon() {
+    switch (updateStatus.status) {
+      case 'completed':
+        return '✅';
+      case 'error':
+        return '❌';
+      case 'in_progress':
+        return '⏳';
+      default:
+        return '🔄';
+    }
+  }
+</script>
+
+<div
+  class="fixed inset-0 z-[9999] flex items-center justify-center bg-background"
+  transition:fade={{ duration: 300 }}
+>
+  <div class="w-full max-w-2xl px-8">
+    <!-- Logo -->
+    <div class="mb-12 flex justify-center">
+      <img src={Logo} alt="CSF Logo" class="h-24 w-24" />
+    </div>
+
+    <!-- Title -->
+    <h1 class="mb-2 text-center text-3xl font-bold">
+      {getStatusIcon()} System Update in Progress
+    </h1>
+
+    <!-- Version Info -->
+    {#if updateStatus.version}
+      <p class="mb-8 text-center text-muted-foreground">
+        Updating to version <span class="font-semibold">{updateStatus.version}</span>
+      </p>
+    {/if}
+
+    <!-- Progress Bar -->
+    <div class="mb-8">
+      <div class="mb-2 flex items-center justify-between">
+        <span class="text-sm font-medium {getStatusColor()}">
+          {updateStatus.message}
+        </span>
+        <span class="text-sm text-muted-foreground">
+          {updateStatus.progress}%
+        </span>
+      </div>
+      <Progress value={updateStatus.progress} class="h-3" />
+    </div>
+
+    <!-- Status Message -->
+    <div class="mb-6 rounded-lg border bg-card p-4">
+      <h3 class="mb-2 text-sm font-semibold">Current Status:</h3>
+      <p class="text-sm text-muted-foreground {getStatusColor()}">
+        {updateStatus.message}
+      </p>
+    </div>
+
+    <!-- Logs -->
+    <div class="rounded-lg border bg-card">
+      <div class="border-b p-3">
+        <h3 class="text-sm font-semibold">Update Log</h3>
+      </div>
+      <div bind:this={logsContainer} class="max-h-64 overflow-y-auto p-3 font-mono text-xs">
+        {#if logs.length === 0}
+          <p class="text-muted-foreground">Waiting for update logs...</p>
+        {:else}
+          {#each logs as log}
+            <div class="mb-1 text-muted-foreground">
+              {log}
+            </div>
+          {/each}
+        {/if}
+      </div>
+    </div>
+
+    <!-- Warning -->
+    <div class="mt-6 text-center text-sm text-muted-foreground">
+      <p>⚠️ Please do not close this window or refresh the page.</p>
+      <p>The system will automatically reload when the update is complete.</p>
+    </div>
+
+    <!-- Error Recovery -->
+    {#if updateStatus.status === 'error'}
+      <div class="mt-6 rounded-lg border border-destructive bg-destructive/10 p-4">
+        <p class="mb-2 text-sm font-semibold text-destructive">Update Failed</p>
+        <p class="mb-4 text-sm text-muted-foreground">
+          An error occurred during the update process. The system may have been rolled back to the
+          previous version.
+        </p>
+        <button
+          onclick={() => window.location.reload()}
+          class="rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90"
+        >
+          Reload Application
+        </button>
+      </div>
+    {/if}
+  </div>
+</div>
+
+<style>
+  /* Smooth scrolling for logs */
+  div::-webkit-scrollbar {
+    width: 8px;
+  }
+
+  div::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  div::-webkit-scrollbar-thumb {
+    background: hsl(var(--muted));
+    border-radius: 4px;
+  }
+
+  div::-webkit-scrollbar-thumb:hover {
+    background: hsl(var(--muted-foreground));
+  }
+</style>
diff --git a/frontend/src/lib/components/settings/UpdateSettings.svelte b/frontend/src/lib/components/settings/UpdateSettings.svelte
index ddc69054..f3bcd0d2 100644
--- a/frontend/src/lib/components/settings/UpdateSettings.svelte
+++ b/frontend/src/lib/components/settings/UpdateSettings.svelte
@@ -8,6 +8,7 @@
   import { Switch } from '$lib/components/ui/switch';
   import { Label } from '$lib/components/ui/label';
   import { updateStore } from '$lib/stores/updates';
+  import { updateInProgress, updateVersion } from '$lib/stores/update';
   import {
     Download,
     RefreshCw,
@@ -60,12 +61,15 @@
     try {
       const response = await updateStore.installUpdate(version);
 
+      // Trigger update screen
+      updateVersion.set(version);
+      updateInProgress.set(true);
+
       message = response.message;
       messageType = 'success';
     } catch (error) {
       message = error instanceof Error ? error.message : 'Unbekannter Fehler';
       messageType = 'error';
-    } finally {
       isInstalling = false;
     }
   }
diff --git a/frontend/src/lib/stores/update.ts b/frontend/src/lib/stores/update.ts
new file mode 100644
index 00000000..65f16c9a
--- /dev/null
+++ b/frontend/src/lib/stores/update.ts
@@ -0,0 +1,4 @@
+import { writable } from 'svelte/store';
+
+export const updateInProgress = writable(false);
+export const updateVersion = writable<string | null>(null);
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 2cd76ecb..2fef25f7 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -3,10 +3,12 @@
   import favicon from '$lib/assets/favicon.svg';
   import { onMount, onDestroy } from 'svelte';
   import AppSidebar from '$lib/components/navbar/app-sidebar.svelte';
+  import UpdateScreen from '$lib/components/UpdateScreen.svelte';
   import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
   import { Separator } from '$lib/components/ui/separator/index.js';
   import * as Sidebar from '$lib/components/ui/sidebar/index.js';
   import { theme, effectiveTheme, initThemeFromStorage } from '$lib/stores/theme';
+  import { updateInProgress } from '$lib/stores/update';
   import { page } from '$app/stores';
   import { authStore } from '$lib/stores/auth';
   import { ApiClient } from '$lib/services/api-client';
@@ -62,6 +64,11 @@
   <link rel="icon" href={favicon} />
 </svelte:head>
 
+<!-- Update Screen Overlay -->
+{#if $updateInProgress}
+  <UpdateScreen />
+{/if}
+
 {#if showSidebar}
   <Sidebar.Provider>
     <AppSidebar />
diff --git a/scripts/update.sh b/scripts/update.sh
index 0973087c..f377ec7f 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -9,114 +9,168 @@ VERSION="${1}"
 REPO="CS-Foundry/CSF-Core"
 INSTALL_DIR="/opt/csf-core"
 BACKUP_DIR="/tmp/csf-core-backup-$(date +%s)"
+STATUS_FILE="/tmp/csf-core-update-status.json"
 
 log() {
-    echo "[$(date +'%Y-%m-%d %H:%M:%S')] $1"
+    local message="[$(date +'%Y-%m-%d %H:%M:%S')] $1"
+    echo "$message"
+    update_status "in_progress" "$1"
 }
 
 error() {
-    echo "[$(date +'%Y-%m-%d %H:%M:%S')] ERROR: $1" >&2
+    local message="[$(date +'%Y-%m-%d %H:%M:%S')] ERROR: $1"
+    echo "$message" >&2
+    update_status "error" "$1"
     exit 1
 }
 
+update_status() {
+    local status="$1"
+    local message="$2"
+    local progress="${3:-0}"
+    
+    cat > "$STATUS_FILE" <<EOF
+{
+  "status": "$status",
+  "message": "$message",
+  "progress": $progress,
+  "version": "$VERSION",
+  "timestamp": "$(date -Iseconds)"
+}
+EOF
+}
+
 # Check if version is provided
 if [ -z "$VERSION" ]; then
     error "No version specified. Usage: $0 <version>"
 fi
 
-log "Starting CSF-Core update to version ${VERSION}..."
+log "🚀 Starting CSF-Core update to version ${VERSION}..." 5
 
 # Check if running as root or with sudo
 if [ "$EUID" -eq 0 ]; then
     SUDO=""
+    log "✓ Running with root privileges" 10
 else
     SUDO="sudo"
+    log "✓ Running with sudo" 10
 fi
 
 # Create backup directory
-log "Creating backup at ${BACKUP_DIR}..."
+log "📦 Creating backup directory at ${BACKUP_DIR}..." 15
 $SUDO mkdir -p "${BACKUP_DIR}"
 
 # Backup current installation
 if [ -d "${INSTALL_DIR}" ]; then
-    log "Backing up current installation..."
+    log "💾 Backing up current installation (this may take a moment)..." 20
     $SUDO cp -r "${INSTALL_DIR}" "${BACKUP_DIR}/"
+    log "✓ Backup completed successfully" 25
+else
+    log "⚠ No existing installation found to backup" 25
 fi
 
 # Stop the service if running
 if systemctl is-active --quiet csf-core.service 2>/dev/null; then
-    log "Stopping CSF-Core service..."
-    $SUDO systemctl stop csf-core.service || log "Service stop failed or not installed"
+    log "⏸️  Stopping CSF-Core service..." 30
+    $SUDO systemctl stop csf-core.service || log "⚠ Service stop failed or not installed"
+    log "✓ Service stopped" 35
+else
+    log "ℹ️  Service not running" 35
 fi
 
-# Download the new version
-DOWNLOAD_URL="https://github.com/${REPO}/archive/refs/tags/v${VERSION}.tar.gz"
+# Detect architecture
+log "🔍 Detecting system architecture..." 40
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    aarch64|arm64)
+        ARCH_NAME="arm64"
+        ;;
+    *)
+        error "Unsupported architecture: $ARCH"
+        ;;
+esac
+log "✓ Detected architecture: $ARCH_NAME" 42
+
+# Detect OS
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+log "✓ Detected OS: $OS" 45
+
+# Download the new binaries
+log "📥 Downloading backend binary for version ${VERSION}..." 50
+BACKEND_URL="https://github.com/${REPO}/releases/download/v${VERSION}/csf-backend-${OS}-${ARCH_NAME}"
 TMP_DIR=$(mktemp -d)
-log "Downloading version ${VERSION} from ${DOWNLOAD_URL}..."
 
-if ! curl -L -o "${TMP_DIR}/csf-core.tar.gz" "${DOWNLOAD_URL}"; then
-    error "Failed to download update from ${DOWNLOAD_URL}"
+if ! curl -L -f -o "${TMP_DIR}/backend" "${BACKEND_URL}" 2>&1 | grep -v "^[0-9 ]*$" || true; then
+    error "Failed to download backend from ${BACKEND_URL}"
 fi
+log "✓ Backend binary downloaded" 60
 
-# Extract the archive
-log "Extracting archive..."
-cd "${TMP_DIR}"
-tar -xzf csf-core.tar.gz || error "Failed to extract archive"
+# Download frontend package
+log "📥 Downloading frontend package..." 65
+FRONTEND_URL="https://github.com/${REPO}/releases/download/v${VERSION}/csf-frontend-${VERSION}.tar.gz"
 
-# Find the extracted directory (should be CSF-Core-<version>)
-EXTRACTED_DIR=$(find "${TMP_DIR}" -maxdepth 1 -type d -name "CSF-Core-*" | head -1)
-if [ -z "$EXTRACTED_DIR" ]; then
-    error "Could not find extracted directory"
+if ! curl -L -f -o "${TMP_DIR}/frontend.tar.gz" "${FRONTEND_URL}" 2>&1 | grep -v "^[0-9 ]*$" || true; then
+    log "⚠ Frontend package not found, will try to keep existing frontend"
 fi
 
-log "Extracted to ${EXTRACTED_DIR}"
+if [ -f "${TMP_DIR}/frontend.tar.gz" ]; then
+    log "✓ Frontend package downloaded" 70
+fi
 
-# Install the update
-log "Installing update..."
-cd "${EXTRACTED_DIR}"
+# Install the binaries
+log "📦 Installing backend binary..." 75
+$SUDO mkdir -p "${INSTALL_DIR}/backend"
+$SUDO cp "${TMP_DIR}/backend" "${INSTALL_DIR}/backend/"
+$SUDO chmod +x "${INSTALL_DIR}/backend/backend"
+log "✓ Backend installed" 80
+
+# Install frontend if downloaded
+if [ -f "${TMP_DIR}/frontend.tar.gz" ]; then
+    log "📦 Installing frontend..." 85
+    $SUDO mkdir -p "${INSTALL_DIR}/frontend"
+    $SUDO tar -xzf "${TMP_DIR}/frontend.tar.gz" -C "${INSTALL_DIR}/frontend/"
+    log "✓ Frontend installed" 90
+fi
 
-# Run installation script if it exists
-if [ -f "scripts/install.sh" ]; then
-    log "Running installation script..."
-    $SUDO bash scripts/install.sh || error "Installation script failed"
-else
-    # Manual installation fallback
-    log "No installation script found, performing manual update..."
-    
-    # Copy files to installation directory
-    $SUDO mkdir -p "${INSTALL_DIR}"
-    $SUDO cp -r ./* "${INSTALL_DIR}/"
+# Set ownership
+log "🔐 Setting correct permissions..." 92
+$SUDO chown -R csf-core:csf-core "${INSTALL_DIR}" 2>/dev/null || $SUDO chown -R root:root "${INSTALL_DIR}"
+log "✓ Permissions set" 95
+
+# Restart service
+log "🔄 Restarting CSF-Core service..." 97
+if systemctl list-unit-files | grep -q csf-core.service; then
+    $SUDO systemctl daemon-reload
+    $SUDO systemctl start csf-core.service
+    sleep 2
     
-    # Set permissions
-    $SUDO chown -R root:root "${INSTALL_DIR}"
-    $SUDO chmod +x "${INSTALL_DIR}/scripts/"*.sh 2>/dev/null || true
-    
-    # Restart service if systemd service exists
-    if [ -f "${INSTALL_DIR}/csf-core.service" ]; then
-        log "Reloading systemd and starting service..."
-        $SUDO systemctl daemon-reload
-        $SUDO systemctl start csf-core.service
-        $SUDO systemctl enable csf-core.service
+    if systemctl is-active --quiet csf-core.service; then
+        log "✅ CSF-Core service is running" 100
+        update_status "completed" "Update completed successfully!" 100
+    else
+        log "❌ Service failed to start" 100
+        update_status "error" "Service failed to start after update" 100
+        error "Service failed to start"
     fi
+else
+    log "⚠ No systemd service found" 100
+    update_status "completed" "Binaries updated, but no service configured" 100
 fi
 
 # Cleanup
-log "Cleaning up temporary files..."
+log "🧹 Cleaning up temporary files..."
 rm -rf "${TMP_DIR}"
 
-# Verify installation
-if systemctl is-active --quiet csf-core.service 2>/dev/null; then
-    log "✓ CSF-Core service is running"
-else
-    log "⚠ CSF-Core service is not running. Manual start may be required."
-fi
-
-log "Update to version ${VERSION} completed successfully!"
-log "Backup saved at: ${BACKUP_DIR}"
+log "✅ Update to version ${VERSION} completed successfully!"
+log "📦 Backup saved at: ${BACKUP_DIR}"
 log ""
-log "If you encounter any issues, you can restore from the backup:"
-log "  sudo rm -rf ${INSTALL_DIR}"
-log "  sudo mv ${BACKUP_DIR}/csf-core ${INSTALL_DIR}"
-log "  sudo systemctl restart csf-core.service"
+log "ℹ️  If you encounter any issues, you can restore from the backup:"
+log "   sudo systemctl stop csf-core.service"
+log "   sudo rm -rf ${INSTALL_DIR}"
+log "   sudo mv ${BACKUP_DIR}/csf-core ${INSTALL_DIR}"
+log "   sudo systemctl start csf-core.service"
 
 exit 0