diff --git a/.github/workflows/build-faq.yml b/.github/workflows/build-faq.yml
index c9ca380a1..f948fc7f5 100644
--- a/.github/workflows/build-faq.yml
+++ b/.github/workflows/build-faq.yml
@@ -44,6 +44,6 @@ jobs:
           else
             echo "created=false" >> "$GITHUB_OUTPUT"
           fi
-      - name: Push changes to dev
+      - name: Push changes
         if: steps.commit.outputs.created == 'true'
-        run: git push origin dev
+        run: git push origin HEAD:${{ github.ref_name }}
diff --git a/admin/debug/index.php b/admin/debug/index.php
index 71005ce31..f500edf55 100644
--- a/admin/debug/index.php
+++ b/admin/debug/index.php
@@ -51,6 +51,7 @@
 echo getNavItemDebug('remotebuzzerlog');
 echo getNavItemDebug('synctodrivelog');
 echo getNavItemDebug('remotestoragelog');
+echo getNavItemDebug('uploadworkerlog');
 echo getNavItemDebug('rembglog');
 echo getNavItemDebug('devlog');
 if (Environment::isLinux()) {
diff --git a/api/admin.php b/api/admin.php
index 798eba21a..f02590bae 100644
--- a/api/admin.php
+++ b/api/admin.php
@@ -12,6 +12,7 @@
 use Photobooth\Service\DatabaseManagerService;
 use Photobooth\Service\ImageMetadataCacheService;
 use Photobooth\Service\LoggerService;
+use Photobooth\Service\EncryptionService;
 use Photobooth\Service\MailService;
 use Photobooth\Service\PrintManagerService;
 use Photobooth\Service\ProcessService;
@@ -182,6 +183,14 @@
     $newConfig['login']['pin']        = $keepExistingSecret('pin', $newConfig['login']['pin'] ?? null, $config);
     $newConfig['login']['rental_pin'] = $keepExistingSecret('rental_pin', $newConfig['login']['rental_pin'] ?? null, $config);
 
+    // Keep existing FTP/Mail passwords when the form sends an empty value
+    if (($newConfig['ftp']['password'] ?? '') === '' && !empty($config['ftp']['password'])) {
+        $newConfig['ftp']['password'] = $config['ftp']['password'];
+    }
+    if (($newConfig['mail']['password'] ?? '') === '' && !empty($config['mail']['password'])) {
+        $newConfig['mail']['password'] = $config['mail']['password'];
+    }
+
     // Hash password early when a new value is provided
     if (!empty($newConfig['login']['password']) && $newConfig['login']['password'] !== ($config['login']['password'] ?? null)) {
         $newConfig['login']['password'] = password_hash($newConfig['login']['password'], PASSWORD_DEFAULT);
@@ -334,6 +343,15 @@
         }
     }
 
+    // Encrypt FTP and Mail passwords before saving to config file
+    $encryptionService = EncryptionService::getInstance();
+    if (!empty($newConfig['ftp']['password']) && !$encryptionService->isEncrypted($newConfig['ftp']['password'])) {
+        $newConfig['ftp']['password'] = $encryptionService->encrypt($newConfig['ftp']['password']);
+    }
+    if (!empty($newConfig['mail']['password']) && !$encryptionService->isEncrypted($newConfig['mail']['password'])) {
+        $newConfig['mail']['password'] = $encryptionService->encrypt($newConfig['mail']['password']);
+    }
+
     if ($newConfig['logo']['enabled']) {
         $logoPath = $newConfig['logo']['path'];
 
diff --git a/api/applyEffects.php b/api/applyEffects.php
index 25530c386..87bed9d3e 100644
--- a/api/applyEffects.php
+++ b/api/applyEffects.php
@@ -13,6 +13,7 @@
 use Photobooth\Service\DatabaseManagerService;
 use Photobooth\Service\LoggerService;
 use Photobooth\Service\RemoteStorageService;
+use Photobooth\Service\UploadQueueService;
 use Photobooth\Utility\ImageUtility;
 use Photobooth\Utility\PathUtility;
 
@@ -336,13 +337,14 @@
             }
         }
 
-        // Store images on remote storage
+        // Queue images for async remote storage upload
         if ($config['ftp']['enabled']) {
-            $remoteStorage->write($remoteStorage->getStorageFolder() . '/images/' . $vars['singleImageFile'], (string) file_get_contents($vars['resultFile']));
-            $remoteStorage->write($remoteStorage->getStorageFolder() . '/thumbs/' . $vars['singleImageFile'], (string) file_get_contents($vars['thumbFile']));
-            if ($config['ftp']['create_webpage']) {
-                $remoteStorage->createWebpage();
-            }
+            $uploadQueue = UploadQueueService::getInstance();
+            $uploadQueue->enqueue(
+                $vars['singleImageFile'],
+                $vars['singleImageFile'],
+                (bool) $config['ftp']['create_webpage']
+            );
         }
 
         // Change permissions
diff --git a/api/deletePhoto.php b/api/deletePhoto.php
index fbafb01f3..5f5a0ba93 100644
--- a/api/deletePhoto.php
+++ b/api/deletePhoto.php
@@ -10,14 +10,13 @@
 use Photobooth\Service\ImageMetadataCacheService;
 use Photobooth\Service\LoggerService;
 use Photobooth\Service\RemoteStorageService;
+use Photobooth\Service\UploadQueueService;
 
 header('Content-Type: application/json');
 
 $logger = LoggerService::getInstance()->getLogger('main');
 $logger->debug(basename($_SERVER['PHP_SELF']));
 
-$remoteStorage = RemoteStorageService::getInstance();
-
 try {
     if (empty($_POST['file'])) {
         throw new \Exception('No file provided');
@@ -81,8 +80,11 @@
     }
 
     if ($config['ftp']['enabled'] && $config['ftp']['delete']) {
-        $remoteStorage->delete($remoteStorage->getStorageFolder() . '/images/' . $fileName);
-        $remoteStorage->delete($remoteStorage->getStorageFolder() . '/thumbs/' . $fileName);
+        $remoteStorage = RemoteStorageService::getInstance();
+        $uploadQueue = UploadQueueService::getInstance();
+        $remoteFilename = $uploadQueue->getRemoteFilename($fileName) ?? $fileName;
+        $remoteStorage->delete('images/' . $remoteFilename);
+        $remoteStorage->delete('thumbs/' . $remoteFilename);
     }
 }
 
diff --git a/api/ftpListFolders.php b/api/ftpListFolders.php
new file mode 100644
index 000000000..7e06de17f
--- /dev/null
+++ b/api/ftpListFolders.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once '../lib/boot.php';
+
+use Photobooth\Service\ConfigurationService;
+use Photobooth\Service\RemoteStorageService;
+
+header('Content-Type: application/json');
+checkCsrfOrFail($_POST);
+
+$ftpData = $_POST['ftp'] ?? [];
+
+$type = (string) ($ftpData['type'] ?? 'ftp');
+$host = (string) ($ftpData['baseURL'] ?? '');
+$port = (int) ($ftpData['port'] ?? 21);
+$username = (string) ($ftpData['username'] ?? '');
+$password = (string) ($ftpData['password'] ?? '');
+$path = (string) ($_POST['path'] ?? '/');
+
+if ($host === '' || $username === '') {
+    echo json_encode(['error' => 'Missing connection parameters']);
+    exit();
+}
+
+// If password is empty, use the saved (decrypted) config password
+if ($password === '') {
+    $savedConfig = ConfigurationService::getInstance()->getConfiguration();
+    $password = (string) ($savedConfig['ftp']['password'] ?? '');
+}
+
+try {
+    $folders = RemoteStorageService::listFolders([
+        'type' => $type,
+        'baseURL' => $host,
+        'port' => $port,
+        'username' => $username,
+        'password' => $password,
+    ], $path);
+
+    echo json_encode(['folders' => $folders]);
+} catch (\Throwable $e) {
+    echo json_encode(['error' => $e->getMessage()]);
+}
+exit();
diff --git a/api/print.php b/api/print.php
index ac87e778d..962dcb565 100644
--- a/api/print.php
+++ b/api/print.php
@@ -10,6 +10,7 @@
 use Photobooth\Service\LoggerService;
 use Photobooth\Service\PrintManagerService;
 use Photobooth\Service\RemoteStorageService;
+use Photobooth\Service\UploadQueueService;
 use Photobooth\Utility\PathUtility;
 
 header('Content-Type: application/json');
@@ -156,10 +157,11 @@
                 $remoteStorageService = RemoteStorageService::getInstance();
                 $url = $remoteStorageService->getWebpageUri();
                 if ($config['qr']['append_filename']) {
-                    $url .= '/images/';
+                    $uploadQueue = UploadQueueService::getInstance();
+                    $remoteFilename = $uploadQueue->getRemoteFilename($vars['fileName']) ?? $vars['fileName'];
+                    $url .= '/?img=' . rawurlencode($remoteFilename);
                 }
-            }
-            if ($config['qr']['append_filename']) {
+            } elseif ($config['qr']['append_filename']) {
                 $url .= $vars['fileName'];
             }
             $imageHandler->qrUrl = PathUtility::getPublicPath($url, true);
diff --git a/api/qrcode.php b/api/qrcode.php
index 225449ee3..9b8090a65 100644
--- a/api/qrcode.php
+++ b/api/qrcode.php
@@ -3,6 +3,7 @@
 /** @var array $config */
 
 use Photobooth\Service\RemoteStorageService;
+use Photobooth\Service\UploadQueueService;
 use Photobooth\Utility\PathUtility;
 use Photobooth\Utility\QrCodeUtility;
 
@@ -20,12 +21,15 @@
     if ($config['ftp']['enabled'] && $config['ftp']['useForQr']) {
         $remoteStorageService = RemoteStorageService::getInstance();
         $url = $remoteStorageService->getWebpageUri();
-        if ($config['qr']['append_filename']) {
-            $url .= '/images/';
-        }
     }
     if ($config['qr']['append_filename']) {
-        $url .= $filename;
+        if ($config['ftp']['enabled'] && $config['ftp']['useForQr']) {
+            $uploadQueue = UploadQueueService::getInstance();
+            $remoteFilename = $uploadQueue->getRemoteFilename($filename) ?? $filename;
+            $url .= '/?img=' . rawurlencode($remoteFilename);
+        } else {
+            $url .= $filename;
+        }
     }
     $url = PathUtility::getPublicPath($url, true);
     try {
diff --git a/api/serverInfo.php b/api/serverInfo.php
index 6ad9af579..0123b3714 100644
--- a/api/serverInfo.php
+++ b/api/serverInfo.php
@@ -20,6 +20,8 @@ function handleDebugPanel(string $content, array $config): string|false
             return readFileContents(PathUtility::getAbsolutePath('var/log/synctodrive.log'));
         case 'nav-remotestoragelog':
             return readFileContents(PathUtility::getAbsolutePath('var/log/remotestorage.log'));
+        case 'nav-uploadworkerlog':
+            return readFileContents(PathUtility::getAbsolutePath('var/log/uploadworker.log'));
         case 'nav-rembglog':
             return readFileContents(PathUtility::getAbsolutePath('var/log/rembg.log'));
         case 'nav-myconfig':
diff --git a/assets/js/admin/buttons.js b/assets/js/admin/buttons.js
index b8b608aee..461cdafbd 100644
--- a/assets/js/admin/buttons.js
+++ b/assets/js/admin/buttons.js
@@ -97,6 +97,205 @@ $(function () {
         return false;
     });
 
+    // FTP Folder Browser
+    function ftpGetFormData() {
+        const formData = $('form').serializeArray();
+        if (typeof csrf !== 'undefined') {
+            formData.push({ name: csrf.key, value: csrf.token });
+        }
+        return formData;
+    }
+
+    function ftpGetParentPath(path) {
+        if (path === '/' || path === '') {
+            return '/';
+        }
+        const trimmed = path.replace(/\/+$/, '');
+        const lastSlash = trimmed.lastIndexOf('/');
+        return lastSlash <= 0 ? '/' : trimmed.substring(0, lastSlash);
+    }
+
+    function ftpLoadFolders(path) {
+        const $container = $('#ftp-folder-browser');
+        const $list = $container.find('.ftp-folder-list');
+        $list.html(
+            '<div class="flex items-center justify-center py-4 text-gray-400"><i class="fa fa-spinner fa-spin mr-2"></i></div>'
+        );
+        $container.removeClass('hidden');
+
+        const formData = ftpGetFormData();
+        formData.push({ name: 'path', value: path });
+
+        $.ajax({
+            url: '../api/ftpListFolders.php',
+            dataType: 'json',
+            data: formData,
+            type: 'post',
+            success: (resp) => {
+                if (resp.error) {
+                    $list.html('<div class="text-sm text-red-400 py-2">' + resp.error + '</div>');
+                    return;
+                }
+
+                let html = '';
+
+                // Toolbar: back button + current path
+                html += '<div class="flex items-center gap-2 mb-3">';
+                if (path !== '/') {
+                    html +=
+                        '<button type="button" class="ftp-nav-folder flex-shrink-0 w-8 h-8 flex items-center justify-center rounded-lg bg-gray-200 hover:bg-brand-1 hover:text-white text-gray-600 transition" data-path="' +
+                        ftpGetParentPath(path) +
+                        '" title="' +
+                        photoboothTools.getTranslation('back') +
+                        '">';
+                    html += '<i class="fa fa-arrow-left"></i>';
+                    html += '</button>';
+                }
+                // Breadcrumb path display
+                const parts = path === '/' ? [] : path.replace(/^\//, '').split('/');
+                html += '<div class="flex items-center gap-0.5 text-sm text-gray-500 overflow-x-auto flex-1 min-w-0">';
+                html +=
+                    '<button type="button" class="ftp-nav-folder px-1.5 py-0.5 rounded hover:bg-gray-200 hover:text-brand-1 font-semibold flex-shrink-0 transition" data-path="/">/</button>';
+                let buildPath = '';
+                for (let i = 0; i < parts.length; i++) {
+                    buildPath += '/' + parts[i];
+                    html += '<span class="text-gray-300 flex-shrink-0">/</span>';
+                    const isLast = i === parts.length - 1;
+                    html +=
+                        '<button type="button" class="ftp-nav-folder px-1.5 py-0.5 rounded hover:bg-gray-200 hover:text-brand-1 flex-shrink-0 transition ' +
+                        (isLast ? 'font-bold text-gray-700' : 'font-semibold') +
+                        '" data-path="' +
+                        buildPath +
+                        '">' +
+                        parts[i] +
+                        '</button>';
+                }
+                html += '</div>';
+                html += '</div>';
+
+                // Select current folder button (only when not at root)
+                if (path !== '/') {
+                    const folderValue = path.replace(/^\//, '');
+                    html +=
+                        '<button type="button" class="ftp-select-folder w-full text-left px-3 py-2.5 mb-3 rounded-lg bg-brand-1 text-white text-sm font-semibold hover:bg-brand-1/80 transition flex items-center gap-2" data-folder="' +
+                        folderValue +
+                        '">';
+                    html += '<i class="fa fa-check"></i>';
+                    html +=
+                        '<span>' +
+                        photoboothTools.getTranslation('ftp:select_folder') +
+                        ': <strong>' +
+                        path +
+                        '</strong></span>';
+                    html += '</button>';
+                }
+
+                // Folder list
+                if (resp.folders.length === 0 && path !== '/') {
+                    html +=
+                        '<div class="text-sm text-gray-400 py-2 text-center">' +
+                        photoboothTools.getTranslation('ftp:no_subfolders') +
+                        '</div>';
+                } else if (resp.folders.length === 0) {
+                    html +=
+                        '<div class="text-sm text-gray-400 py-2 text-center">' +
+                        photoboothTools.getTranslation('ftp:no_subfolders') +
+                        '</div>';
+                } else {
+                    html += '<div class="flex flex-col gap-1">';
+                    resp.folders.forEach((folder) => {
+                        const folderName = folder.split('/').pop();
+                        const fullPath = '/' + folder;
+                        html +=
+                            '<div class="flex items-center rounded-lg border border-gray-200 hover:border-brand-1 hover:bg-blue-50 transition overflow-hidden">';
+                        // Clickable folder row (navigate into)
+                        html +=
+                            '<button type="button" class="ftp-nav-folder flex-1 flex items-center gap-3 px-3 py-2.5 text-left text-sm hover:text-brand-1 transition min-w-0" data-path="' +
+                            fullPath +
+                            '">';
+                        html += '<i class="fa fa-folder text-brand-1 text-base flex-shrink-0"></i>';
+                        html += '<span class="truncate">' + folderName + '</span>';
+                        html += '<i class="fa fa-chevron-right text-gray-300 ml-auto flex-shrink-0"></i>';
+                        html += '</button>';
+                        // Select button
+                        html +=
+                            '<button type="button" class="ftp-select-folder flex-shrink-0 px-3 py-2.5 text-xs font-semibold text-brand-1 hover:bg-brand-1 hover:text-white border-l border-gray-200 transition" data-folder="' +
+                            folder +
+                            '">';
+                        html += photoboothTools.getTranslation('ftp:select_folder');
+                        html += '</button>';
+                        html += '</div>';
+                    });
+                    html += '</div>';
+                }
+
+                $list.html(html);
+            },
+            error: () => {
+                $list.html('<div class="text-sm text-red-400 py-2">Failed to load folders</div>');
+            }
+        });
+    }
+
+    function ftpEnsureBrowseButton() {
+        const $baseFolderCard = $('[name="ftp\\[baseFolder\\]"]').closest('.adminSettingCard');
+        if ($baseFolderCard.length === 0) {
+            return;
+        }
+
+        // Add browse button next to baseFolder input if not already present
+        if ($('#ftp-browse-btn').length === 0) {
+            const $input = $baseFolderCard.find('input[name="ftp\\[baseFolder\\]"]');
+            $input.wrap('<div class="flex items-center gap-2 w-full"></div>');
+            $input.after(
+                '<button type="button" id="ftp-browse-btn" class="hidden flex-shrink-0 h-10 px-3 rounded-lg bg-brand-1 text-white text-sm font-semibold hover:bg-brand-1/80 transition flex items-center gap-2">' +
+                    '<i class="fa fa-folder-open"></i> ' +
+                    photoboothTools.getTranslation('ftp:browse_folders') +
+                    '</button>'
+            );
+        }
+
+        // Add folder browser container below baseFolder card if not present
+        if ($('#ftp-folder-browser').length === 0) {
+            let browserHtml =
+                '<div id="ftp-folder-browser" class="hidden mt-4 p-4 rounded-xl border-2 border-brand-1/30 bg-gray-50">';
+            browserHtml += '<div class="flex items-center justify-between mb-3">';
+            browserHtml +=
+                '<h4 class="text-sm font-bold text-brand-1"><i class="fa fa-folder-open mr-2"></i>' +
+                photoboothTools.getTranslation('ftp:browse_folders') +
+                '</h4>';
+            browserHtml +=
+                '<button type="button" id="ftp-folder-browser-close" class="text-gray-400 hover:text-gray-700 text-lg leading-none">&times;</button>';
+            browserHtml += '</div>';
+            browserHtml += '<div class="ftp-folder-list"></div>';
+            browserHtml += '</div>';
+            $baseFolderCard.append(browserHtml);
+
+            $('#ftp-folder-browser-close').on('click', function () {
+                $('#ftp-folder-browser').addClass('hidden');
+            });
+        }
+
+        // Show the browse button
+        $('#ftp-browse-btn').removeClass('hidden');
+    }
+
+    // Delegated click handlers for folder browser
+    $(document).on('click', '.ftp-nav-folder', function (e) {
+        e.preventDefault();
+        ftpLoadFolders($(this).data('path'));
+    });
+    $(document).on('click', '.ftp-select-folder', function (e) {
+        e.preventDefault();
+        const folder = $(this).data('folder');
+        $('[name="ftp\\[baseFolder\\]"]').val(folder).trigger('change');
+        $('#ftp-folder-browser').addClass('hidden');
+    });
+    $(document).on('click', '#ftp-browse-btn', function (e) {
+        e.preventDefault();
+        ftpLoadFolders('/');
+    });
+
     $('#test-connection').on('click', function (e) {
         e.preventDefault();
         const elem = $(this);
@@ -108,13 +307,7 @@ $(function () {
         $.ajax({
             url: '../api/testFtpConnection.php',
             dataType: 'json',
-            data: (function () {
-                const formData = $('form').serializeArray();
-                if (typeof csrf !== 'undefined') {
-                    formData.push({ name: csrf.key, value: csrf.token });
-                }
-                return formData;
-            })(),
+            data: ftpGetFormData(),
             type: 'post',
             success: (resp) => {
                 photoboothTools.console.log('resp', resp);
@@ -124,6 +317,11 @@ $(function () {
                     $('#ftp\\:' + el).addClass('required');
                 });
                 alert(photoboothTools.getTranslation(resp.message));
+
+                // On successful connection, enable folder browser at baseFolder field
+                if (resp.response === 'success') {
+                    ftpEnsureBrowseButton();
+                }
             },
 
             error: (jqXHR) => {
@@ -132,9 +330,10 @@ $(function () {
 
             complete: (jqXHR, textStatus) => {
                 const status = jqXHR.status;
+                const resp = jqXHR.responseJSON;
                 let classes = 'isActive isSuccess';
                 let findClasses = '.success span';
-                if (status != 200 || jqXHR.responseJSON.response != 'success' || textStatus != 'success') {
+                if (status != 200 || !resp || resp.response != 'success' || textStatus != 'success') {
                     classes = 'isActive isError';
                     findClasses = '.error span';
                 }
@@ -336,4 +535,12 @@ $(function () {
 
         return false;
     });
+
+    // Show FTP folder browse button on page load if FTP credentials are already configured
+    const ftpHost = $('[name="ftp\\[baseURL\\]"]').val();
+    const ftpUser = $('[name="ftp\\[username\\]"]').val();
+    const ftpPassPlaceholder = $('[name="ftp\\[password\\]"]').attr('placeholder');
+    if (ftpHost && ftpUser && ftpPassPlaceholder === '********') {
+        ftpEnsureBrowseButton();
+    }
 });
diff --git a/assets/js/debugpanel.js b/assets/js/debugpanel.js
index 35d097c7f..114fb8b6b 100644
--- a/assets/js/debugpanel.js
+++ b/assets/js/debugpanel.js
@@ -77,7 +77,13 @@ class DebugPanel {
             .then((html) => {
                 this.debugContent.innerHTML = '<pre class="break-all whitespace-pre-wrap">' + html + '</pre>';
                 if (
-                    ['nav-devlog', 'nav-remotebuzzerlog', 'nav-synctodrivelog'].indexOf(this.currentNavigationId) != -1
+                    [
+                        'nav-devlog',
+                        'nav-remotebuzzerlog',
+                        'nav-synctodrivelog',
+                        'nav-remotestoragelog',
+                        'nav-uploadworkerlog'
+                    ].indexOf(this.currentNavigationId) != -1
                 ) {
                     this.adminContent.scrollTo(0, this.adminContent.scrollHeight);
                 } else {
diff --git a/docs/faq/index.md b/docs/faq/index.md
index d87301002..01829652b 100644
--- a/docs/faq/index.md
+++ b/docs/faq/index.md
@@ -356,38 +356,71 @@ and enter/adjust the @chromium-browser entries as followed (adjust the value _19
 
 ---
 
-## How does the connection to the FTP server work?
+## How does the connection to the FTP/SFTP server work?
 
-The connection to the FTP server needs 4 distinct properties.
+### Connection settings
 
--   `baseURL` which is the url where all requests will be made
--   `port` for ssl connection (the default value is 21)
--   `username` the username of the user authorized to interact to the FTP server
--   `password` the password of the user
+The following properties are required to connect to the remote server:
 
-With these four variables you can test the connection to the FTP server to check if everything is alright.
+-   `type` — protocol: `ftp` (default) or `sftp`
+-   `baseURL` — hostname or IP address of the server
+-   `port` — port number (default: `21` for FTP, `22` for SFTP)
+-   `username` — username authorized to access the server
+-   `password` — password for that user (stored encrypted on disk)
 
-The next variables are for the place where you want the pictures to be stored:
+Use **Test Connection** in the admin panel to verify the credentials before saving.
 
--   `baseFolder` is the folder of your website (if you have multiple websites living on the server with this property you can choose on which of these the file should be stored)
--   `folder` the folder dedicated to the upload of the files
--   `title` if you are doing an event you can set the title of the event to create another folder (the system will slugify the string)
+### Storage location
 
-In the end the processed picture, and the thumbnails, will be uploaded in the folder according to these variables.
+-   `baseFolder` — root folder on the server where all files are stored (e.g. `photobooth` or `www/gallery`). You can browse available folders using the folder picker in the admin panel.
+-   `title` — optional event title; used as the page title of the online gallery
 
-If you have a website, you can use the following variables to generate the qr codes that will point to the photos uploaded to the ftp server
+Photos are stored inside `<baseFolder>/images/` and thumbnails inside `<baseFolder>/thumbs/` using privacy-preserving random filenames so the original file names are never exposed on the server.
 
--   `useForQr` to enable this functionality
--   `website` accessible from the internet, it will be the base of the qr code link
--   `urlTemplate` starting from the previous set of variables, you have to define the template which will be used to generate the qrcode link (each variable should be written whit '%' before e.g. %website/%folder/%date)
+### QR code integration
 
-Last but not least you can upload a php file on the `title` folder on the FTP server to create an online gallery which is updated with every new picture (and collage) taken.
-The variable to manage this feature are the following:
+-   `useForQr` — when enabled, QR codes point to the remote gallery instead of the local Photobooth
+-   `website` — publicly accessible base URL of the remote server (e.g. `https://example.com`)
 
--   `create_webpage` to enable this functionality
--   `template_location` which is the location of the index.php file, which is formatted with the title of the current event and uploaded to the FTP server
+The QR code URL is built automatically as `<website>/<baseFolder>/?img=<remote-filename>`. No manual URL template is required.
 
-In the end you can enable the `delete` functionality that will delete photos (and collages) from the ftp server when they are deleted from the photobooth gallery (no admin reset)
+### Online gallery
+
+-   `create_webpage` — when enabled, Photobooth uploads a ready-to-use PHP gallery (`index.php` and `config.inc.php`) to the `baseFolder` on the server. The gallery is updated with every new photo.
+-   `template_location` — path to the local `index.php` template that is uploaded (default: `resources/template/index.php`)
+
+The gallery shows photos sorted newest-first and supports single-image deep links via `?img=<filename>`. While a photo is still being uploaded the visitor sees a spinner; the page reloads automatically once the image is available. A native share button (Web Share API) and a lightbox with keyboard navigation are included.
+
+Directory listing for `images/` and `thumbs/` is blocked by `index.php` redirect guards that are uploaded automatically.
+
+### Async upload queue
+
+Uploads run **asynchronously** in a background worker so the Photobooth UI is never blocked while files are transferred. After a photo is taken, a job is added to a local SQLite queue. The worker processes jobs one by one and retries up to 5 times on failure.
+
+To run the worker as a persistent background service, copy the provided systemd unit and enable it:
+
+```bash
+sudo cp resources/config/photobooth-upload-worker.service /etc/systemd/system/
+sudo systemctl daemon-reload
+sudo systemctl enable --now photobooth-upload-worker
+sudo systemctl status photobooth-upload-worker
+```
+
+The worker can also be run manually for testing:
+
+```bash
+# Process all pending jobs once and exit
+sudo -u www-data php bin/photobooth photobooth:upload:worker --once
+
+# Run continuously (polls every 5 seconds)
+sudo -u www-data php bin/photobooth photobooth:upload:worker
+```
+
+Upload queue status (pending jobs, failed jobs) is visible in the Photobooth debug panel.
+
+### Delete on local delete
+
+Enable `delete` to automatically remove the photo and thumbnail from the FTP/SFTP server whenever a photo is deleted from the local Photobooth gallery (does not apply to admin reset).
 
 ---
 
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index c15e4923a..f761bc538 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -2405,9 +2405,9 @@
         'mail_password' => [
             'view' => 'basic',
             'type' => 'input',
-            'placeholder' => $defaultConfig['mail']['password'],
+            'placeholder' => !empty($config['mail']['password']) ? '********' : '',
             'name' => 'mail[password]',
-            'value' => htmlentities($config['mail']['password'] ?? ''),
+            'value' => '',
         ],
         'mail_fromAddress' => [
             'view' => 'basic',
@@ -2689,9 +2689,9 @@
         'password' => [
             'view' => 'advanced',
             'type' => 'input',
-            'placeholder' => '',
+            'placeholder' => !empty($config['ftp']['password']) ? '********' : '',
             'name' => 'ftp[password]',
-            'value' => $config['ftp']['password'],
+            'value' => '',
         ],
         'test_connection' => [
             'view' => 'basic',
@@ -2707,13 +2707,6 @@
             'name' => 'ftp[baseFolder]',
             'value' => $config['ftp']['baseFolder'],
         ],
-        'folder' => [
-            'view' => 'advanced',
-            'type' => 'input',
-            'placeholder' => 'photobooth',
-            'name' => 'ftp[folder]',
-            'value' => $config['ftp']['folder'],
-        ],
         'title' => [
             'view' => 'advanced',
             'type' => 'input',
@@ -2734,13 +2727,6 @@
             'name' => 'ftp[website]',
             'value' => $config['ftp']['website'],
         ],
-        'urlTemplate' => [
-            'view' => 'advanced',
-            'type' => 'input',
-            'placeholder' => '%website%/%folder%/%title%',
-            'name' => 'ftp[urlTemplate]',
-            'value' => $config['ftp']['urlTemplate'],
-        ],
         'create_webpage' => [
             'view' => 'basic',
             'type' => 'checkbox',
diff --git a/resources/config/photobooth-upload-worker.service b/resources/config/photobooth-upload-worker.service
new file mode 100644
index 000000000..62ed8a390
--- /dev/null
+++ b/resources/config/photobooth-upload-worker.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Photobooth Async Upload Worker
+After=network.target
+
+[Service]
+Type=simple
+User=www-data
+Group=www-data
+WorkingDirectory=/var/www/html
+ExecStart=/usr/bin/php bin/photobooth photobooth:upload:worker
+Restart=always
+RestartSec=10
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=photobooth-upload
+
+[Install]
+WantedBy=multi-user.target
diff --git a/resources/lang/en.json b/resources/lang/en.json
index ed830ba4f..c063187f2 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -214,20 +214,22 @@
   "ftp": "FTP Server",
   "ftp:baseFolder": "Base folder",
   "ftp:baseURL": "Server URL",
+  "ftp:browse_folders": "Browse Folders",
   "ftp:connected": "Successfully connected to the FTP server.",
   "ftp:create_webpage": "Create webpage on ftp folder",
   "ftp:delete": "Delete image on ftp server if deleted on photobooth",
   "ftp:enabled": "Enable server FTP",
-  "ftp:folder": "Folder",
+  "ftp:image_uploading": "Your photo is being uploaded...",
   "ftp:missing_parameters": "Missing parameters! Fill all required input.",
   "ftp:no_connection": "Unable to connect to the FTP server!",
+  "ftp:no_subfolders": "No subfolders",
   "ftp:password": "Password",
   "ftp:port": "FTP-Server port",
+  "ftp:select_folder": "Select",
   "ftp:template_location": "Template file location",
   "ftp:test_connection": "Test connection",
   "ftp:title": "Title",
   "ftp:type": "Connection",
-  "ftp:urlTemplate": "Url template for qr generation",
   "ftp:useForQr": "Use the output from the FTP server as input to generate the QR code",
   "ftp:username": "Username",
   "ftp:website": "Website",
@@ -505,17 +507,15 @@
   "manual:ftp:create_webpage": "Create a webpage starting from the file index.php that function as a gallery on the base folder.",
   "manual:ftp:delete": "If enabled, it will delete the image and the thumbnail on the ftp server if it is deleted on the Photobooth.",
   "manual:ftp:enabled": "If enabled, after taking and processing the picture, it will be sent to the ftp server to store it.",
-  "manual:ftp:folder": "The /path/to/directory on the disk of the ftp server. If the folder does not exist it will be created (always check your ftp server configuration).",
   "manual:ftp:password": "In combination with username to authenticate the user who send the file on the server.",
   "manual:ftp:port": "FTP Server port.",
   "manual:ftp:template_location": "Location of the index.php file. Choose another location to use a custom index.php file. REMEMBER: the file has to have a {title} placeholder.",
   "manual:ftp:test_connection": "Will execute a test connection to the FTP server using the data passed.",
   "manual:ftp:title": "Title of the sub-folder. It will be appended to folder. If website is enabled it will be used on the html title tag and in the page header.",
   "manual:ftp:type": "Choose to use FTP or SFTP connection.",
-  "manual:ftp:urlTemplate": "Set the url template to generate the qr code. The placeholder are '%website', '%baseFolder', '%folder', '%title' (as slug) and '%date'. The filename is appended at the end.",
   "manual:ftp:useForQr": "If enabled, the output received from the FTP server after storing the picture it will be used as input for the generation of the QR code (always check your ftp server configuration).",
   "manual:ftp:username": "In combination with password to authenticate the user who send the file on the server.",
-  "manual:ftp:website": "The website accessible from the internet of the ftp server. To this website will be appended the folder structure and the file name of the picture to reach the file on the internet.",
+  "manual:ftp:website": "The root URL of the FTP server website (e.g. https://photos.example.com). The base folder path is automatically appended to build the gallery URL.",
   "manual:gallery:gallery_allow_delete": "If enabled pictures can be deleted from the gallery at any time.",
   "manual:gallery:gallery_bottom_bar": "If enabled, the button bar is shown in the gallery below.",
   "manual:gallery:gallery_date_format": "Enter your date style.",
@@ -1006,6 +1006,8 @@
   "remotebuzzer:remotebuzzer_userotary": "Enable Rotary Encoder",
   "remotebuzzer:remotebuzzer_videobutton": "Video Button",
   "remotebuzzerGetTrigger": "Remotebuzzer GET request trigger",
+  "remotebuzzerlog": "Remote Buzzer Log",
+  "remotestoragelog": "Remote Storage Log",
   "remoteStorageTemplate": "Remote Storage Template test",
   "reset": "Reset",
   "reset_lock": "Unlock",
@@ -1071,6 +1073,7 @@
   "synctodrive:synctodrive_enabled": "Enable",
   "synctodrive:synctodrive_interval": "Automated syncing interval",
   "synctodrive:synctodrive_target": "USB device identifier",
+  "synctodrivelog": "Sync to Drive Log",
   "takeCollage": "Collage",
   "takePhoto": "Picture",
   "takeSelfie": "Selfie",
@@ -1104,6 +1107,7 @@
   "upload_unable_to_write_folder": "Unable to upload the file to the folder. Enable write access!",
   "upload_wrong_type": "The file is not in the correct type list",
   "uploading": "Uploading...",
+  "uploadworkerlog": "FTP Upload Worker Log",
   "userinterface": "User interface",
   "userinterface:background_admin": "Admin panel background image path",
   "userinterface:background_chroma": "Chroma keying panel background image path",
@@ -1195,6 +1199,6 @@
   "video:video_gif": "Video as GIF",
   "video:video_qr": "Show video QR code",
   "viewer_photo_title": "Your photo",
-  "viewer_video_fallback": "Your browser can’t play this video.",
+  "viewer_video_fallback": "Your browser can't play this video.",
   "wait_message": "Please wait..."
 }
diff --git a/resources/template/index.php b/resources/template/index.php
index b31a291bc..95b4ff99a 100644
--- a/resources/template/index.php
+++ b/resources/template/index.php
@@ -1,66 +1,49 @@
 <?php
 
-if (file_exists('config.inc.php')) {
-    $templateConfig = require 'config.inc.php';
+if (file_exists(__DIR__ . '/config.inc.php')) {
+    $templateConfig = require __DIR__ . '/config.inc.php';
 }
 
 if (!isset($templateConfig)) {
     die('config.inc.php missing');
 }
 
+// Determine access mode: single image view or gallery
+$requestedImage = isset($_GET['img']) ? basename((string) $_GET['img']) : '';
+$galleryEnabled = (bool) ($templateConfig['gallery_enabled'] ?? false);
+$mode = $requestedImage !== '' ? 'single' : ($galleryEnabled ? 'gallery' : 'single');
+
 $images = [
-    'images' => glob($templateConfig['paths']['images'] . '/*.{jpg,JPG}', GLOB_BRACE) ?: [],
-    'thumbs' => glob($templateConfig['paths']['thumbs'] . '/*.{jpg,JPG}', GLOB_BRACE) ?: [],
+    'images' => glob(__DIR__ . '/' . $templateConfig['paths']['images'] . '/*.{jpg,JPG,png,PNG}', GLOB_BRACE) ?: [],
+    'thumbs' => glob(__DIR__ . '/' . $templateConfig['paths']['thumbs'] . '/*.{jpg,JPG,png,PNG}', GLOB_BRACE) ?: [],
 ];
 
-asort($images['images']);
-asort($images['thumbs']);
+usort($images['images'], fn ($a, $b) => filemtime($b) - filemtime($a));
+usort($images['thumbs'], fn ($a, $b) => filemtime($b) - filemtime($a));
 
-$firstImage = $images['images'][0] ?? null;
 $totalImages = count($images['images']);
 
 $requestUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-$urlPrefix = $requestUrl;
-if (substr($urlPrefix, -4) === '.php') {
-    $baseName = basename($urlPrefix);
-    $urlPrefix = rtrim($urlPrefix, $baseName);
-}
+$urlPrefix = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']);
 if (substr($urlPrefix, -1) !== '/') {
     $urlPrefix .= '/';
 }
 
-$ogImage = $urlPrefix . $firstImage;
-
-header('Cache-Control: max-age=' . $templateConfig['meta']['max-age']);
-
-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    zipFilesAndDownload($images['images'], $templateConfig);
-}
-
-function zipFilesAndDownload($files, $templateConfig)
-{
-    // create new zip opbject
+// ZIP download handler
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && $mode === 'gallery') {
     $zip = new ZipArchive();
+    $tmp_file = tempnam(sys_get_temp_dir(), 'zipped');
+    $zip->open($tmp_file, ZipArchive::CREATE | ZipArchive::OVERWRITE);
 
-    // create a temp file & open it
-    $tmp_file = tempnam('.', 'zipped');
-    $zip->open($tmp_file, ZipArchive::CREATE);
-
-    // loop through each file
-    foreach ($files as $file) {
-        if (str_contains($file, 'tmb_')) {
+    foreach ($images['images'] as $file) {
+        $download_file = file_get_contents($file);
+        if ($download_file === false) {
             continue;
         }
-
-        // download file
-        $download_file = file_get_contents($file);
-        //add it to the zip
         $zip->addFromString(basename($file), $download_file);
     }
-    // close zip
     $zip->close();
 
-    // send the file to the browser as a download
     header('Content-disposition: attachment; filename="' . $templateConfig['files']['download_prefix'] . '.zip"');
     header('Content-type: application/zip');
     header('Content-length: ' . filesize($tmp_file));
@@ -69,6 +52,15 @@ function zipFilesAndDownload($files, $templateConfig)
     readfile($tmp_file);
     ignore_user_abort(true);
     unlink($tmp_file);
+    exit;
+}
+
+header('Cache-Control: max-age=' . $templateConfig['meta']['max-age']);
+
+// Determine display content based on mode
+if ($mode === 'single' && $requestedImage !== '') {
+    $singleImageUrl = 'images/' . rawurlencode($requestedImage);
+    $singleDownloadName = $templateConfig['files']['download_prefix'] . '_' . $requestedImage;
 }
 
 $styles = '';
@@ -87,6 +79,7 @@ function zipFilesAndDownload($files, $templateConfig)
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="robots" content="noindex, nofollow" />
     <link
         rel="stylesheet"
         href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
@@ -98,13 +91,14 @@ function zipFilesAndDownload($files, $templateConfig)
     <!--  Essential META Tags -->
     <meta property="og:title" content="<?= $templateConfig['meta']['title'] ?>">
     <meta property="og:type" content="article" />
-    <meta property="og:image" content="<?= $ogImage ?>">
-    <meta property="og:url" content="<?= $requestUrl ?>">
+    <?php if ($mode === 'single' && $requestedImage !== ''): ?>
+        <meta property="og:image" content="<?= $urlPrefix . $singleImageUrl ?>">
+    <?php endif; ?>
+    <meta property="og:url" content="<?= htmlspecialchars($requestUrl) ?>">
     <meta name="twitter:card" content="summary_large_image">
 
     <!--  Non-Essential, But Recommended -->
     <meta property="og:site_name" content="<?= $templateConfig['meta']['sitename'] ?>">
-    <meta name="twitter:image" content="<?= $ogImage ?>">
     <title><?= $templateConfig['meta']['title'] ?></title>
 
     <?= $styles ?>
@@ -127,7 +121,7 @@ function zipFilesAndDownload($files, $templateConfig)
             font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
             font-weight: 600;
             background-image: linear-gradient(135deg, var(--primary-color) 30%, var(--secondary-color));
-            color: var(--primary-color);
+            color: var(--font-color);
             min-height: 100dvh;
         }
 
@@ -137,7 +131,7 @@ function zipFilesAndDownload($files, $templateConfig)
         }
 
         .front-cover {
-            background-image: linear-gradient(rgba(0,0,0,.5), rgba(0,0,0,.85)), url(<?= $urlPrefix . $firstImage ?>);
+            background-image: linear-gradient(rgba(0,0,0,.5), rgba(0,0,0,.85));
             background-position: center;
             background-repeat: no-repeat;
             background-size: cover;
@@ -268,7 +262,99 @@ function zipFilesAndDownload($files, $templateConfig)
         .lightbox-action-bar > a {
             margin: 0 1rem;
         }
+
+        .lightbox-nav {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            color: white;
+            font-size: clamp(1.5rem, 4vw, 2.5rem);
+            padding: 1rem 1.25rem;
+            background: rgba(0,0,0,.35);
+            border-radius: .5rem;
+            line-height: 1;
+            transition: background .2s;
+            z-index: 1;
+        }
+
+        .lightbox-nav:hover {
+            background: rgba(0,0,0,.6);
+        }
+
+        .lightbox-nav-prev { left: .75rem; }
+        .lightbox-nav-next { right: .75rem; }
+
+        /* Single image viewer */
+        .viewer-container {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            gap: 2rem;
+            padding: 2rem;
+            min-height: 80vh;
+            justify-content: center;
+        }
+
+        .viewer-container img {
+            max-width: 100%;
+            max-height: 70vh;
+            border-radius: .5rem;
+            box-shadow: 0 10px 30px 5px rgba(0, 0, 0, 0.3);
+        }
+
+        .viewer-actions {
+            display: flex;
+            gap: 1rem;
+            align-items: center;
+        }
+
+        .viewer-actions a {
+            display: inline-flex;
+            align-items: center;
+            gap: .5rem;
+            padding: .75rem 1.5rem;
+            border-radius: 2rem;
+            background: var(--primary-color);
+            color: var(--button-font-color);
+            font-size: 1rem;
+            box-shadow: 0 4px 12px rgba(0,0,0,.25);
+            transition: background .3s;
+        }
+
+        .viewer-actions a:hover {
+            background: color-mix(in srgb, var(--primary-color), var(--button-font-color) 20%);
+        }
     </style>
+    <script>
+        var pbTotal = <?= $totalImages ?>;
+        document.addEventListener('keydown', function (e) {
+            var hash = window.location.hash;
+            var m = hash.match(/^#lightbox-uid-(\d+)$/);
+            if (!m) return;
+            var cur = parseInt(m[1], 10);
+            if (e.key === 'ArrowLeft')  { window.location.hash = '#lightbox-uid-' + (cur > 0 ? cur - 1 : pbTotal - 1); }
+            if (e.key === 'ArrowRight') { window.location.hash = '#lightbox-uid-' + (cur < pbTotal - 1 ? cur + 1 : 0); }
+            if (e.key === 'Escape')     { window.location.hash = '#gallery-list-item-' + cur; }
+        });
+
+        function pbShare(imageUrl, fallbackUrl) {
+            if (navigator.share && navigator.canShare) {
+                fetch(imageUrl)
+                    .then(function (r) { return r.blob(); })
+                    .then(function (blob) {
+                        var file = new File([blob], 'photo.jpg', { type: blob.type });
+                        if (navigator.canShare({ files: [file] })) {
+                            navigator.share({ files: [file] }).catch(function () {});
+                            return;
+                        }
+                        window.open(fallbackUrl);
+                    })
+                    .catch(function () { window.open(fallbackUrl); });
+            } else {
+                window.open(fallbackUrl);
+            }
+        }
+    </script>
 </head>
 <body>
     <header class="front-cover">
@@ -276,48 +362,90 @@ function zipFilesAndDownload($files, $templateConfig)
             <?= $templateConfig['meta']['title'] ?>
         </div>
     </header>
-    <div class="container">
-        <div class="gallery-list">
-            <?php foreach ($images['images'] as $key => $filename) { ?>
-                <?php
-                    $filename = basename($filename);
-                $image = $urlPrefix . $templateConfig['paths']['images'] . '/' . $filename;
-                $thumbnail = $image;
-                $possibleThumbnail = $templateConfig['paths']['thumbs'] . '/' . $filename;
-                if (file_exists($possibleThumbnail)) {
-                    $thumbnail = $urlPrefix . $possibleThumbnail;
-                }
-                ?>
-                <a class="gallery-list-item" id="gallery-list-item-<?= $key ?>" href="#lightbox-uid-<?= $key ?>">
-                    <figure>
-                        <img src="<?= $thumbnail ?>" alt="<?= basename($filename) ?>" loading="lazy" />
-                    </figure>
+
+    <?php if ($mode === 'single' && $requestedImage !== ''): ?>
+        <!-- Single Image Viewer: JS checks if image is accessible, retries on error -->
+        <div class="viewer-container">
+            <div id="pb-uploading" style="text-align:center;color:var(--font-color,#fff);">
+                <i class="fa-solid fa-spinner fa-spin" style="font-size:3rem;margin-bottom:1.5rem;display:block;opacity:.6;"></i>
+                <p style="font-size:1.2rem;margin:0;"><?= $templateConfig['labels']['image_uploading'] ?? 'Your photo is being uploaded...' ?></p>
+            </div>
+            <img id="pb-photo" src="<?= $singleImageUrl ?>" alt="Photo" style="display:none" />
+            <div id="pb-actions" class="viewer-actions" style="display:none">
+                <a href="<?= $singleImageUrl ?>" download="<?= htmlspecialchars($singleDownloadName) ?>">
+                    <i class="fa-solid fa-download"></i> <?= $templateConfig['labels']['download'] ?>
+                </a>
+                <a href="#" onclick="pbShare('<?= $singleImageUrl ?>', 'https://wa.me/?text=<?= urlencode(sprintf($templateConfig['labels']['share'], $requestUrl)) ?>'); return false;">
+                    <i class="fa-solid fa-share-nodes"></i>
                 </a>
-                <div class="lightbox" id="lightbox-uid-<?= $key ?>">
-                    <div class="lightbox-content">
-                        <div class="lightbox-action-bar-outer">
-                            <div class="lightbox-action-bar">
-                                <a href="<?= $image ?>" download="<?= $templateConfig['files']['download_prefix'] ?>_<?= basename($image) ?>">
-                                    <i class="fa-solid fa-download"></i>
-                                </a>
-                                <a href="whatsapp://send?text=<?= urlencode(sprintf($templateConfig['labels']['share'], $image))?>">
-                                    <i class="fa-brands fa-whatsapp"></i>
-                                </a>
-                                <a href="#gallery-list-item-<?= $key ?>" title="<?= $templateConfig['labels']['close'] ?>">
-                                    <i class="fa-solid fa-xmark"></i>
-                                </a>
+            </div>
+        </div>
+        <script>
+            (function () {
+                var img = document.getElementById('pb-photo');
+                var uploading = document.getElementById('pb-uploading');
+                var actions = document.getElementById('pb-actions');
+                img.onload = function () {
+                    uploading.style.display = 'none';
+                    img.style.display = 'block';
+                    actions.style.display = 'flex';
+                };
+                img.onerror = function () {
+                    setTimeout(function () { window.location.reload(); }, 3000);
+                };
+            }());
+        </script>
+    <?php elseif ($mode === 'gallery'): ?>
+        <!-- Gallery View -->
+        <div class="container">
+            <div class="gallery-list">
+                <?php foreach ($images['images'] as $key => $filename) { ?>
+                    <?php
+                        $filename = basename($filename);
+                    $imageUrl = 'images/' . rawurlencode($filename);
+                    $thumbnailUrl = $imageUrl;
+                    $possibleThumbnail = __DIR__ . '/' . $templateConfig['paths']['thumbs'] . '/' . $filename;
+                    if (file_exists($possibleThumbnail)) {
+                        $thumbnailUrl = 'thumbs/' . rawurlencode($filename);
+                    }
+                    ?>
+                    <a class="gallery-list-item" id="gallery-list-item-<?= $key ?>" href="#lightbox-uid-<?= $key ?>">
+                        <figure>
+                            <img src="<?= $thumbnailUrl ?>" alt="<?= htmlspecialchars(basename($filename)) ?>" loading="lazy" />
+                        </figure>
+                    </a>
+                    <?php
+                        $prevKey = $key > 0 ? $key - 1 : $totalImages - 1;
+                    $nextKey = $key < $totalImages - 1 ? $key + 1 : 0;
+                    ?>
+                    <div class="lightbox" id="lightbox-uid-<?= $key ?>">
+                        <div class="lightbox-content">
+                            <div class="lightbox-action-bar-outer">
+                                <div class="lightbox-action-bar">
+                                    <a href="<?= $imageUrl ?>" download="<?= $templateConfig['files']['download_prefix'] ?>_<?= htmlspecialchars(basename($filename)) ?>">
+                                        <i class="fa-solid fa-download"></i>
+                                    </a>
+                                    <a href="#" onclick="pbShare('<?= $imageUrl ?>', 'https://wa.me/?text=<?= urlencode(sprintf($templateConfig['labels']['share'], $urlPrefix . '?img=' . rawurlencode($filename))) ?>'); return false;">
+                                        <i class="fa-solid fa-share-nodes"></i>
+                                    </a>
+                                    <a href="#gallery-list-item-<?= $key ?>" title="<?= $templateConfig['labels']['close'] ?>">
+                                        <i class="fa-solid fa-xmark"></i>
+                                    </a>
+                                </div>
                             </div>
+                            <a class="lightbox-nav lightbox-nav-prev" href="#lightbox-uid-<?= $prevKey ?>"><i class="fa-solid fa-chevron-left"></i></a>
+                            <a class="lightbox-nav lightbox-nav-next" href="#lightbox-uid-<?= $nextKey ?>"><i class="fa-solid fa-chevron-right"></i></a>
+                            <img src="<?= $imageUrl ?>" alt="<?= htmlspecialchars(basename($filename)) ?>" loading="lazy" />
                         </div>
-                        <img src="<?= $image ?>" alt="<?= $image ?>" loading="lazy" />
                     </div>
-                </div>
-            <?php } ?>
+                <?php } ?>
+            </div>
+        </div>
+        <div class="container">
+            <form target="_blank" action="" method="post" onsubmit="return confirm('<?= sprintf($templateConfig['labels']['download_confirmation_images'], $totalImages) ?>')">
+                <button type="submit" class="big-button"><?= $templateConfig['labels']['download'] ?></button>
+            </form>
         </div>
-    </div>
-    <div class="container">
-        <form target="_blank" action="" method="post" onsubmit="return confirm('<?= sprintf($templateConfig['labels']['download_confirmation_images'], $totalImages) ?>')">
-            <button type="submit" class="big-button"><?= $templateConfig['labels']['download'] ?></button>
-        </form>
-    </div>
+    <?php endif; ?>
 </body>
 </html>
diff --git a/src/Command/UploadWorkerCommand.php b/src/Command/UploadWorkerCommand.php
new file mode 100644
index 000000000..144d91c02
--- /dev/null
+++ b/src/Command/UploadWorkerCommand.php
@@ -0,0 +1,126 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Photobooth\Command;
+
+use Photobooth\Enum\FolderEnum;
+use Photobooth\Service\ConfigurationService;
+use Photobooth\Service\LoggerService;
+use Photobooth\Service\RemoteStorageService;
+use Photobooth\Service\UploadQueueService;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'photobooth:upload:worker',
+    description: 'Processes the async FTP/SFTP upload queue'
+)]
+class UploadWorkerCommand extends Command
+{
+    protected function configure(): void
+    {
+        $this->setDescription('Processes the async FTP/SFTP upload queue');
+        $this->addOption('once', null, InputOption::VALUE_NONE, 'Process one job and exit');
+        $this->addOption('poll-interval', null, InputOption::VALUE_REQUIRED, 'Seconds between queue polls', '5');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $logger = LoggerService::getInstance()->getLogger('uploadworker');
+        $queue = UploadQueueService::getInstance();
+        $once = (bool) $input->getOption('once');
+        $pollInterval = (int) $input->getOption('poll-interval');
+
+        $output->writeln('Upload worker started.');
+        $logger->info('Upload worker started');
+
+        // Reset any stale in_progress jobs from previous crashed runs
+        $queue->resetStaleJobs();
+
+        $setupDone = false;
+        $lastConfigHash = '';
+
+        while (true) {
+            $job = $queue->fetchNext();
+
+            if ($job === null) {
+                if ($once) {
+                    $output->writeln('No pending jobs, exiting.');
+
+                    return Command::SUCCESS;
+                }
+                sleep($pollInterval);
+                continue;
+            }
+
+            $jobId = (int) $job['id'];
+            $imageFile = (string) $job['image_file'];
+            $thumbFile = (string) $job['thumb_file'];
+            $remoteFilename = (string) $job['remote_filename'];
+
+            $output->writeln('Processing job #' . $jobId . ': ' . $imageFile . ' -> ' . $remoteFilename);
+            $logger->info('Processing upload job', ['id' => $jobId, 'image' => $imageFile, 'remote' => $remoteFilename]);
+
+            $queue->markInProgress($jobId);
+
+            try {
+                // Reload config from disk and create fresh RemoteStorageService per job
+                // to pick up any admin panel config changes while worker is running
+                ConfigurationService::getInstance()->load();
+                $configHash = md5(serialize(ConfigurationService::getInstance()->getConfiguration()['ftp']));
+                if ($configHash !== $lastConfigHash) {
+                    $setupDone = false;
+                    $lastConfigHash = $configHash;
+                }
+
+                $remoteStorage = new RemoteStorageService();
+
+                // Setup remote directories and webpage once, retry on failure
+                if (!$setupDone) {
+                    $remoteStorage->ensureDirectoriesExist();
+                    $remoteStorage->createWebpage();
+                    $setupDone = true;
+                    $logger->info('Remote setup completed.');
+                }
+
+                $imagePath = FolderEnum::IMAGES->absolute() . DIRECTORY_SEPARATOR . $imageFile;
+                $thumbPath = FolderEnum::THUMBS->absolute() . DIRECTORY_SEPARATOR . $thumbFile;
+
+                if (!file_exists($imagePath)) {
+                    throw new \RuntimeException('Image file not found: ' . $imagePath);
+                }
+
+                $imageContents = file_get_contents($imagePath);
+                if ($imageContents === false) {
+                    throw new \RuntimeException('Failed to read image file: ' . $imagePath);
+                }
+
+                $remoteStorage->write($remoteStorage->getStoragePath('images/' . $remoteFilename), $imageContents);
+
+                if (file_exists($thumbPath)) {
+                    $thumbContents = file_get_contents($thumbPath);
+                    if ($thumbContents !== false) {
+                        $remoteStorage->write($remoteStorage->getStoragePath('thumbs/' . $remoteFilename), $thumbContents);
+                    }
+                }
+
+                $queue->markCompleted($jobId);
+                $logger->info('Upload completed', ['id' => $jobId, 'remote' => $remoteFilename]);
+                $output->writeln('Job #' . $jobId . ' completed successfully.');
+            } catch (\Throwable $e) {
+                $setupDone = false;
+                $queue->markFailed($jobId, $e->getMessage());
+                $output->writeln('Job #' . $jobId . ' failed: ' . $e->getMessage());
+                $logger->error('Upload job failed', ['id' => $jobId, 'error' => $e->getMessage()]);
+            }
+
+            if ($once) {
+                return Command::SUCCESS;
+            }
+        }
+    }
+}
diff --git a/src/Configuration/Section/FtpConfiguration.php b/src/Configuration/Section/FtpConfiguration.php
index 240b0e9e8..2a0cee348 100644
--- a/src/Configuration/Section/FtpConfiguration.php
+++ b/src/Configuration/Section/FtpConfiguration.php
@@ -39,11 +39,9 @@ public static function getNode(): NodeDefinition
                 ->scalarNode('username')->defaultValue('')->end()
                 ->scalarNode('password')->defaultValue('')->end()
                 ->scalarNode('baseFolder')->defaultValue('')->end()
-                ->scalarNode('folder')->defaultValue('')->end()
                 ->scalarNode('title')->defaultValue('')->end()
                 ->booleanNode('useForQr')->defaultValue(false)->end()
                 ->scalarNode('website')->defaultValue('')->end()
-                ->scalarNode('urlTemplate')->defaultValue('%website%/%folder%/%title%')->end()
                 ->booleanNode('create_webpage')->defaultValue(false)->end()
                 ->scalarNode('template_location')->defaultValue('resources/template/index.php')->end()
                 ->booleanNode('delete')->defaultValue(false)->end()
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 93a0905b7..f3ea659cb 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -30,6 +30,7 @@ protected function getDefaultCommands(): array
                 (new Command\ConfigListCommand())
                     ->setPhotoboothConfig($this->photoboothConfig),
                 new Command\EnvironmentListCommand(),
+                new Command\UploadWorkerCommand(),
             ]
         );
     }
diff --git a/src/Service/ConfigurationService.php b/src/Service/ConfigurationService.php
index f504dfe71..62da46409 100644
--- a/src/Service/ConfigurationService.php
+++ b/src/Service/ConfigurationService.php
@@ -43,9 +43,24 @@ public function load(): void
         }
         $configuration = (new Processor())->processConfiguration(new PhotoboothConfiguration(), [$userConfiguration]);
         $configuration = $this->addDefaults($configuration);
+        $configuration = $this->decryptSensitiveValues($configuration);
         $this->configuration = $configuration;
     }
 
+    protected function decryptSensitiveValues(array $config): array
+    {
+        $encryption = EncryptionService::getInstance();
+
+        if (!empty($config['ftp']['password'])) {
+            $config['ftp']['password'] = $encryption->decrypt($config['ftp']['password']);
+        }
+        if (!empty($config['mail']['password'])) {
+            $config['mail']['password'] = $encryption->decrypt($config['mail']['password']);
+        }
+
+        return $config;
+    }
+
     public function update(array $data): void
     {
         $data = (new Processor())->processConfiguration(new PhotoboothConfiguration(), [$data]);
diff --git a/src/Service/EncryptionService.php b/src/Service/EncryptionService.php
new file mode 100644
index 000000000..20d80efb9
--- /dev/null
+++ b/src/Service/EncryptionService.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Photobooth\Service;
+
+use Photobooth\Utility\PathUtility;
+
+class EncryptionService
+{
+    protected string $key;
+
+    public function __construct()
+    {
+        $this->key = $this->loadOrCreateKey();
+    }
+
+    public function encrypt(string $plaintext): string
+    {
+        if ($plaintext === '' || $this->isEncrypted($plaintext)) {
+            return $plaintext;
+        }
+
+        $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+        $ciphertext = sodium_crypto_secretbox($plaintext, $nonce, $this->key);
+
+        return 'enc:' . base64_encode($nonce . $ciphertext);
+    }
+
+    public function decrypt(string $value): string
+    {
+        if (!$this->isEncrypted($value)) {
+            return $value;
+        }
+
+        $decoded = base64_decode(substr($value, 4), true);
+        if ($decoded === false || strlen($decoded) < SODIUM_CRYPTO_SECRETBOX_NONCEBYTES) {
+            return $value;
+        }
+
+        $nonce = substr($decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+        $ciphertext = substr($decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+
+        $plaintext = sodium_crypto_secretbox_open($ciphertext, $nonce, $this->key);
+        if ($plaintext === false) {
+            return $value;
+        }
+
+        return $plaintext;
+    }
+
+    public function isEncrypted(string $value): bool
+    {
+        return str_starts_with($value, 'enc:');
+    }
+
+    protected function loadOrCreateKey(): string
+    {
+        $keyPath = PathUtility::getAbsolutePath('var/run/config_encryption_key');
+
+        if (file_exists($keyPath)) {
+            $key = file_get_contents($keyPath);
+            if ($key !== false && strlen($key) === SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
+                return $key;
+            }
+        }
+
+        $key = sodium_crypto_secretbox_keygen();
+        $dir = dirname($keyPath);
+        if (!is_dir($dir)) {
+            mkdir($dir, 0755, true);
+        }
+        file_put_contents($keyPath, $key);
+        chmod($keyPath, 0600);
+
+        return $key;
+    }
+
+    public static function getInstance(): self
+    {
+        if (!isset($GLOBALS[self::class])) {
+            $GLOBALS[self::class] = new self();
+        }
+
+        return $GLOBALS[self::class];
+    }
+}
diff --git a/src/Service/RemoteStorageService.php b/src/Service/RemoteStorageService.php
index f6c0f6007..325d155b3 100644
--- a/src/Service/RemoteStorageService.php
+++ b/src/Service/RemoteStorageService.php
@@ -9,8 +9,6 @@
 use League\Flysystem\Ftp\FtpConnectionOptions;
 use League\Flysystem\PhpseclibV3\SftpAdapter;
 use League\Flysystem\PhpseclibV3\SftpConnectionProvider;
-use League\Flysystem\UnableToListContents;
-use League\Flysystem\UnableToReadFile;
 use League\Flysystem\UnixVisibility\PortableVisibilityConverter;
 use Photobooth\Enum\RemoteStorageTypeEnum;
 use Photobooth\Logger\NamedLogger;
@@ -33,10 +31,6 @@ public function __construct()
 
     public function createWebpage(): void
     {
-        if ($this->fileExists($this->getStorageFolder() . '/index.php') && $this->fileExists($this->getStorageFolder() . '/config.php')) {
-            return;
-        }
-
         $templateLocation = PathUtility::getAbsolutePath($this->config['template_location']);
         if (!file_exists($templateLocation)) {
             return;
@@ -59,39 +53,67 @@ public function createWebpage(): void
             'files' => [
                 'download_prefix' => SlugUtility::create($config['ftp']['title']),
             ],
+            'gallery_enabled' => (bool) $config['ftp']['create_webpage'],
             'labels' => [
                 'close' => $languageService->translate('close'),
                 'share' => $languageService->translate('shareMessage'),
                 'download' => $languageService->translate('download'),
                 'download_confirmation_images' => $languageService->translate('download_confirmation_images'),
+                'image_uploading' => $languageService->translate('ftp:image_uploading'),
             ],
             'theme' => [
                 '--primary-color' => $config['colors']['primary'],
                 '--secondary-color' => $config['colors']['secondary'],
-                '--button-font-color' => $config['colors']['button_font'],
+                '--button-font-color' => $config['fonts']['button_font_color'] ?? $config['colors']['font'],
                 '--font-color' => $config['colors']['font'],
-            ]
+            ],
         ];
 
-        $this->write($this->getStorageFolder() . '/config.inc.php', "<?php\n\nreturn " . ArrayUtility::export($parameters) . ";\n");
-        $this->write($this->getStorageFolder() . '/index.php', (string) file_get_contents($templateLocation));
+        // Always update config and template
+        $this->write($this->getStoragePath('config.inc.php'), "<?php\n\nreturn " . ArrayUtility::export($parameters) . ";\n");
+        $this->write($this->getStoragePath('index.php'), (string) file_get_contents($templateLocation));
+
+        // Remove legacy .htaccess files that cause 403 on hosts without AllowOverride Options
+        $this->delete($this->getStoragePath('images/.htaccess'));
+        $this->delete($this->getStoragePath('thumbs/.htaccess'));
+
+        // Prevent directory listing without relying on AllowOverride Options
+        $indexGuard = "<?php header('Location: ../'); exit;\n";
+        $this->write($this->getStoragePath('images/index.php'), $indexGuard);
+        $this->write($this->getStoragePath('thumbs/index.php'), $indexGuard);
     }
 
     public function getWebpageUri(): string
     {
-        $template = (string) $this->config['urlTemplate'];
-        $template = str_replace('%website%', $this->config['website'], $template);
-        $template = str_replace('%folder%', $this->config['folder'], $template);
-        $template = str_replace('%title%', SlugUtility::create($this->config['title']), $template);
+        $website = rtrim((string) $this->config['website'], '/');
+        $baseFolder = trim((string) $this->config['baseFolder'], '/');
+
+        if ($baseFolder !== '') {
+            return $website . '/' . $baseFolder;
+        }
+
+        return $website;
+    }
 
-        return $template;
+    public function getStoragePath(string $relativePath): string
+    {
+        return $relativePath;
     }
 
-    public function getStorageFolder(): string
+    public function ensureDirectoriesExist(): void
     {
-        $storageFolder = SlugUtility::create($this->config['folder']) . '/' . SlugUtility::create($this->config['title']);
+        $directories = [
+            $this->getStoragePath('images'),
+            $this->getStoragePath('thumbs'),
+        ];
 
-        return $storageFolder;
+        foreach ($directories as $directory) {
+            try {
+                $this->filesystem->createDirectory($directory);
+            } catch (FilesystemException $e) {
+                $this->logger->debug('Directory may already exist, continuing.', [$directory, $e->getMessage()]);
+            }
+        }
     }
 
     public function fileExists(string $location): bool
@@ -115,20 +137,101 @@ public function delete(string $location): void
 
     public function testConnection(): bool
     {
-        $this->logger->debug('Testing upload connection.');
+        $this->logger->info('Testing upload connection.');
         try {
             $files = [];
             $contents = $this->filesystem->listContents('/', false);
             foreach ($contents as $object) {
                 $files[] = $object->path();
             }
-            $this->logger->debug('Connection established.', [$files]);
-            return true;
-        } catch (FilesystemException | UnableToListContents | UnableToReadFile $exception) {
+            $this->logger->info('Connection established.', [$files]);
+        } catch (\Throwable $exception) {
             $this->logger->error('Connection failed.', ['exception' => $exception->getMessage()]);
+
+            return false;
+        }
+
+        try {
+            $this->ensureDirectoriesExist();
+            $this->createWebpage();
+            $this->logger->info('Remote setup completed.');
+        } catch (\Throwable $exception) {
+            $this->logger->error('Remote setup failed.', ['exception' => $exception->getMessage()]);
         }
 
-        return false;
+        return true;
+    }
+
+    /**
+     * Create a temporary Filesystem instance from raw config values (not saved config).
+     * Used for folder browsing before config is saved.
+     *
+     * @param array{type: string, baseURL: string, port: int, username: string, password: string} $config
+     */
+    public static function createTemporaryFilesystem(array $config, string $root = '/'): Filesystem
+    {
+        $ip = gethostbyname($config['baseURL']);
+        $host = $ip !== $config['baseURL'] ? $ip : $config['baseURL'];
+        $type = RemoteStorageTypeEnum::from($config['type']);
+
+        $adapter = match ($type) {
+            RemoteStorageTypeEnum::FTP => new FtpAdapter(
+                FtpConnectionOptions::fromArray([
+                    'host' => $host,
+                    'root' => $root,
+                    'username' => $config['username'],
+                    'password' => $config['password'],
+                    'port' => (int) $config['port'],
+                ])
+            ),
+            RemoteStorageTypeEnum::SFTP => new SftpAdapter(
+                SftpConnectionProvider::fromArray([
+                    'host' => $host,
+                    'username' => $config['username'],
+                    'password' => $config['password'],
+                    'port' => (int) $config['port'],
+                ]),
+                $root,
+                PortableVisibilityConverter::fromArray([
+                    'file' => ['public' => 0664, 'private' => 0664],
+                    'dir' => ['public' => 0775, 'private' => 0775],
+                ])
+            ),
+        };
+
+        return new Filesystem($adapter);
+    }
+
+    /**
+     * List folders at the given path using provided connection config.
+     *
+     * @param array{type: string, baseURL: string, port: int, username: string, password: string} $config
+     * @return string[]
+     */
+    public static function listFolders(array $config, string $path = '/'): array
+    {
+        $filesystem = self::createTemporaryFilesystem($config);
+        $folders = [];
+
+        foreach ($filesystem->listContents($path, false) as $item) {
+            if ($item->isDir()) {
+                $folders[] = $item->path();
+            }
+        }
+
+        sort($folders);
+
+        return $folders;
+    }
+
+    /**
+     * Resolve hostname to IPv4 address to avoid IPv6 connection issues.
+     */
+    protected function resolveHostToIPv4(string $host): string
+    {
+        $ip = gethostbyname($host);
+
+        return $ip !== $host ? $ip : $host;
     }
 
     protected function getAdapter(array $config): FilesystemAdapter
@@ -146,7 +249,7 @@ protected function getAdapterForFtp(array $config): FtpAdapter
     {
         return new FtpAdapter(
             FtpConnectionOptions::fromArray([
-                'host' => $config['baseURL'],
+                'host' => $this->resolveHostToIPv4($config['baseURL']),
                 'root' => '/' . $config['baseFolder'],
                 'username' => $config['username'],
                 'password' => $config['password'],
@@ -159,7 +262,7 @@ protected function getAdapterForSftp(array $config): SftpAdapter
     {
         return new SftpAdapter(
             SftpConnectionProvider::fromArray([
-                'host' => $config['baseURL'],
+                'host' => $this->resolveHostToIPv4($config['baseURL']),
                 'username' => $config['username'],
                 'password' => $config['password'],
                 'port' => $config['port']
diff --git a/src/Service/UploadQueueService.php b/src/Service/UploadQueueService.php
new file mode 100644
index 000000000..ff61be906
--- /dev/null
+++ b/src/Service/UploadQueueService.php
@@ -0,0 +1,218 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Photobooth\Service;
+
+use Photobooth\Logger\NamedLogger;
+use Photobooth\Utility\PathUtility;
+
+class UploadQueueService
+{
+    protected \PDO $db;
+    protected NamedLogger $logger;
+
+    public function __construct()
+    {
+        $this->logger = LoggerService::getInstance()->getLogger('uploadqueue');
+        $dbPath = PathUtility::getAbsolutePath('var/run/upload_queue.sqlite');
+        $dir = dirname($dbPath);
+        if (!is_dir($dir)) {
+            mkdir($dir, 0755, true);
+        }
+        $this->db = new \PDO('sqlite:' . $dbPath);
+        $this->db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+        $this->initializeDatabase();
+    }
+
+    protected function initializeDatabase(): void
+    {
+        $this->db->exec('CREATE TABLE IF NOT EXISTS upload_queue (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            image_file TEXT NOT NULL,
+            thumb_file TEXT NOT NULL,
+            remote_filename TEXT NOT NULL DEFAULT \'\',
+            create_webpage INTEGER NOT NULL DEFAULT 0,
+            status TEXT NOT NULL DEFAULT \'pending\',
+            retries INTEGER NOT NULL DEFAULT 0,
+            error_message TEXT,
+            created_at TEXT NOT NULL DEFAULT (datetime(\'now\')),
+            updated_at TEXT NOT NULL DEFAULT (datetime(\'now\'))
+        )');
+
+        $this->db->exec('CREATE INDEX IF NOT EXISTS idx_upload_queue_status ON upload_queue (status)');
+        $this->db->exec('CREATE INDEX IF NOT EXISTS idx_upload_queue_image_file ON upload_queue (image_file)');
+
+        // Migrate: add remote_filename column if missing (existing installations)
+        $columns = $this->db->query('PRAGMA table_info(upload_queue)');
+        $hasRemoteFilename = false;
+        if ($columns !== false) {
+            while ($col = $columns->fetch(\PDO::FETCH_ASSOC)) {
+                if ($col['name'] === 'remote_filename') {
+                    $hasRemoteFilename = true;
+                    break;
+                }
+            }
+        }
+        if (!$hasRemoteFilename) {
+            $this->db->exec('ALTER TABLE upload_queue ADD COLUMN remote_filename TEXT NOT NULL DEFAULT \'\'');
+        }
+    }
+
+    public function enqueue(string $imageFile, string $thumbFile, bool $createWebpage): int
+    {
+        $extension = strtolower(pathinfo($imageFile, PATHINFO_EXTENSION));
+        $remoteFilename = bin2hex(random_bytes(16)) . '.' . $extension;
+
+        $stmt = $this->db->prepare(
+            'INSERT INTO upload_queue (image_file, thumb_file, remote_filename, create_webpage, status) VALUES (:image_file, :thumb_file, :remote_filename, :create_webpage, \'pending\')'
+        );
+        $stmt->execute([
+            ':image_file' => $imageFile,
+            ':thumb_file' => $thumbFile,
+            ':remote_filename' => $remoteFilename,
+            ':create_webpage' => $createWebpage ? 1 : 0,
+        ]);
+
+        $id = (int) $this->db->lastInsertId();
+        $this->logger->debug('Enqueued upload job', ['id' => $id, 'image' => $imageFile, 'remote' => $remoteFilename]);
+
+        return $id;
+    }
+
+    public function getRemoteFilename(string $localFilename): ?string
+    {
+        $stmt = $this->db->prepare(
+            'SELECT remote_filename FROM upload_queue WHERE image_file = :image_file ORDER BY id DESC LIMIT 1'
+        );
+        $stmt->execute([':image_file' => $localFilename]);
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if ($row === false || $row['remote_filename'] === '') {
+            return null;
+        }
+
+        return (string) $row['remote_filename'];
+    }
+
+    /**
+     * @return array{id: int, image_file: string, thumb_file: string, remote_filename: string, create_webpage: int, status: string, retries: int, error_message: string|null, created_at: string, updated_at: string}|null
+     */
+    public function fetchNext(): ?array
+    {
+        $stmt = $this->db->prepare(
+            'SELECT * FROM upload_queue WHERE status = \'pending\' ORDER BY id ASC LIMIT 1'
+        );
+        $stmt->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if ($row === false) {
+            return null;
+        }
+
+        /** @var array{id: int, image_file: string, thumb_file: string, remote_filename: string, create_webpage: int, status: string, retries: int, error_message: string|null, created_at: string, updated_at: string} $row */
+        return $row;
+    }
+
+    public function markInProgress(int $id): void
+    {
+        $stmt = $this->db->prepare(
+            'UPDATE upload_queue SET status = \'in_progress\', updated_at = datetime(\'now\') WHERE id = :id'
+        );
+        $stmt->execute([':id' => $id]);
+    }
+
+    public function markCompleted(int $id): void
+    {
+        $stmt = $this->db->prepare(
+            'UPDATE upload_queue SET status = \'completed\', updated_at = datetime(\'now\') WHERE id = :id'
+        );
+        $stmt->execute([':id' => $id]);
+        $this->logger->debug('Upload completed', ['id' => $id]);
+    }
+
+    public function markFailed(int $id, string $errorMessage, int $maxRetries = 5): void
+    {
+        $stmt = $this->db->prepare(
+            'SELECT retries FROM upload_queue WHERE id = :id'
+        );
+        $stmt->execute([':id' => $id]);
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if ($row === false) {
+            return;
+        }
+
+        $retries = (int) $row['retries'] + 1;
+
+        if ($retries >= $maxRetries) {
+            $updateStmt = $this->db->prepare(
+                'UPDATE upload_queue SET status = \'failed\', retries = :retries, error_message = :error, updated_at = datetime(\'now\') WHERE id = :id'
+            );
+            $this->logger->error('Upload permanently failed', ['id' => $id, 'retries' => $retries, 'error' => $errorMessage]);
+        } else {
+            $updateStmt = $this->db->prepare(
+                'UPDATE upload_queue SET status = \'pending\', retries = :retries, error_message = :error, updated_at = datetime(\'now\') WHERE id = :id'
+            );
+            $this->logger->debug('Upload failed, will retry', ['id' => $id, 'retries' => $retries, 'error' => $errorMessage]);
+        }
+
+        $updateStmt->execute([
+            ':id' => $id,
+            ':retries' => $retries,
+            ':error' => $errorMessage,
+        ]);
+    }
+
+    public function resetStaleJobs(int $timeoutMinutes = 10): void
+    {
+        $stmt = $this->db->prepare(
+            'UPDATE upload_queue SET status = \'pending\', updated_at = datetime(\'now\') WHERE status = \'in_progress\' AND updated_at < datetime(\'now\', :timeout)'
+        );
+        $stmt->execute([':timeout' => '-' . $timeoutMinutes . ' minutes']);
+    }
+
+    public function getPendingCount(): int
+    {
+        $stmt = $this->db->query('SELECT COUNT(*) FROM upload_queue WHERE status IN (\'pending\', \'in_progress\')');
+        if ($stmt === false) {
+            return 0;
+        }
+
+        return (int) $stmt->fetchColumn();
+    }
+
+    public function getFailedCount(): int
+    {
+        $stmt = $this->db->query('SELECT COUNT(*) FROM upload_queue WHERE status = \'failed\'');
+        if ($stmt === false) {
+            return 0;
+        }
+
+        return (int) $stmt->fetchColumn();
+    }
+
+    /**
+     * @return array<int, array{id: int, image_file: string, status: string, retries: int, error_message: string|null}>
+     */
+    public function getStatus(): array
+    {
+        $stmt = $this->db->query('SELECT id, image_file, status, retries, error_message FROM upload_queue ORDER BY id ASC');
+        if ($stmt === false) {
+            return [];
+        }
+
+        /** @var array<int, array{id: int, image_file: string, status: string, retries: int, error_message: string|null}> */
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    public static function getInstance(): self
+    {
+        if (!isset($GLOBALS[self::class])) {
+            $GLOBALS[self::class] = new self();
+        }
+
+        return $GLOBALS[self::class];
+    }
+}
diff --git a/view.php b/view.php
index 682c8bbd8..09274dfc5 100644
--- a/view.php
+++ b/view.php
@@ -8,6 +8,8 @@
 
 require_once __DIR__ . '/lib/boot.php';
 
+$languageService = LanguageService::getInstance();
+
 $imageParam = $_GET['image'] ?? '';
 $image = basename((string) $imageParam);
 
@@ -31,9 +33,9 @@
     'gif' => 'image/gif',
     default => 'image/jpeg',
 };
+
 $imageUrl = PathUtility::getPublicPath(FolderEnum::IMAGES->value . '/' . rawurlencode($image));
 $downloadUrl = PathUtility::getPublicPath('api/download.php?image=' . rawurlencode($image));
-$languageService = LanguageService::getInstance();
 $pageTitle = ApplicationService::getInstance()->getTitle() . ' - ' . $languageService->translate('viewer_photo_title');
 $photoswipe = false;
 $remoteBuzzer = false;