New translations en-us.json (Spanish)

[ci skip]
New translations en-us.json (Norwegian Bokmal)
2026-05-23 16:49:52 +00:00 · 2026-05-21 17:36:31 -07:00 · 2026-05-21 17:36:29 -07:00 · 2026-05-21 17:36:28 -07:00 · 2026-05-21 17:36:26 -07:00 · 2026-05-21 17:36:23 -07:00
79 changed files with 1652 additions and 5713 deletions
--- a/messages/bg-BG.json
+++ b/messages/bg-BG.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Отидете към ресурса",
    "resourceDelete": "Изтрийте ресурс",
    "resourceDeleteConfirm": "Потвърдете изтриване на ресурс",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Видимост",
    "enabled": "Активиран",
    "disabled": "Деактивиран",
@@ -630,7 +647,7 @@
    "createdAt": "Създаден на",
    "proxyErrorInvalidHeader": "Невалидна стойност за заглавие на хоста. Използвайте формат на име на домейн, или оставете празно поле за да премахнете персонализирано заглавие на хост.",
    "proxyErrorTls": "Невалидно име на TLS сървър. Използвайте формат на име на домейн, или оставете празно за да премахнете името на TLS сървъра.",
-    "proxyEnableSSL": "Активиране на TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Активирайте SSL/TLS криптиране за сигурни HTTPS връзки към целите.",
    "target": "Цел",
    "configureTarget": "Конфигуриране на цели",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Имаше проблем със свързването към {name}. Моля, свържете се с вашия администратор.",
    "idpErrorNotFound": "Не е намерен идентификационен доставчик",
    "inviteInvalid": "Невалидна покана",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Линкът към поканата е невалиден.",
    "inviteErrorWrongUser": "Поканата не е за този потребител",
    "inviteErrorUserNotExists": "Потребителят не съществува. Моля, създайте акаунт първо.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Сертификат",
    "certificateStatusAutoRefreshHint": "Състоянието се опреснява автоматично.",
    "loading": "Зареждане",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Зареждане на анализи",
    "restart": "Рестарт",
    "domains": "Домейни",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Метод",
-    "editInternalResourceDialogEnableSsl": "Активирайте TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Активирайте SSL/TLS криптиране за сигурни HTTPS връзки към целта.",
    "editInternalResourceDialogDestination": "Дестинация",
    "editInternalResourceDialogDestinationHostDescription": "IP адресът или името на хоста на ресурса в мрежата на сайта.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Метод",
    "createInternalResourceDialogScheme": "Метод",
-    "createInternalResourceDialogEnableSsl": "Активирайте TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Активирайте SSL/TLS криптиране за сигурни HTTPS връзки към целта.",
    "createInternalResourceDialogDestination": "Дестинация",
    "createInternalResourceDialogDestinationHostDescription": "IP адресът или името на хоста на ресурса в мрежата на сайта.",
@@ -2233,7 +2260,7 @@
        "description": "По-надежден и по-нисък поддръжка на Самостоятелно-хостван Панголиин сървър с допълнителни екстри",
        "introTitle": "Управлявано Самостоятелно-хостван Панголиин",
        "introDescription": "е опция за внедряване, предназначена за хора, които искат простота и допълнителна надеждност, като същевременно запазят данните си частни и самостоятелно-хоствани.",
-        "introDetail": "С тази опция все още управлявате свой собствен Панголиин възел - вашите тунели, TLS терминатора и трафик остават на вашия сървър. Разликата е, че управлението и мониторингът се обработват чрез нашия облачен панел за контрол, който отключва редица предимства:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "По-прости операции",
            "description": "Няма нужда да управлявате свой собствен имейл сървър или да настройвате сложни аларми. Ще получите проверки и предупреждения при прекъсване от самото начало."
@@ -3136,7 +3163,7 @@
    "httpDestNamePlaceholder": "Моята HTTP дестинация",
    "httpDestUrlLabel": "Дестинация URL",
    "httpDestUrlErrorHttpRequired": "URL адресът трябва да използва http или https",
-    "httpDestUrlErrorHttpsRequired": "HTTPS е необходимо за облачни инсталации",
+    "httpDestUrlErrorHttpsRequired": "SSL е необходимо за облачни инсталации",
    "httpDestUrlErrorInvalid": "Въведете валиден URL (напр. https://example.com/webhook)",
    "httpDestAuthTitle": "Удостоверяване",
    "httpDestAuthDescription": "Изберете как заявленията ви се удостоверяват.",
--- a/messages/cs-CZ.json
+++ b/messages/cs-CZ.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Přejít na dokument",
    "resourceDelete": "Odstranit dokument",
    "resourceDeleteConfirm": "Potvrdit odstranění dokumentu",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Viditelnost",
    "enabled": "Povoleno",
    "disabled": "Zakázáno",
@@ -630,7 +647,7 @@
    "createdAt": "Vytvořeno v",
    "proxyErrorInvalidHeader": "Neplatná hodnota hlavičky hostitele. Použijte formát názvu domény, nebo uložte prázdné pro zrušení vlastního hlavičky hostitele.",
    "proxyErrorTls": "Neplatné jméno TLS serveru. Použijte formát doménového jména nebo uložte prázdné pro odstranění názvu TLS serveru.",
-    "proxyEnableSSL": "Povolit TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Povolit šifrování SSL/TLS pro zabezpečená připojení HTTPS k cílům.",
    "target": "Target",
    "configureTarget": "Konfigurace cílů",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Při připojování k {name}došlo k chybě. Obraťte se na správce.",
    "idpErrorNotFound": "IdP nenalezen",
    "inviteInvalid": "Neplatná pozvánka",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Odkaz pro pozvání je neplatný.",
    "inviteErrorWrongUser": "Pozvat není pro tohoto uživatele",
    "inviteErrorUserNotExists": "Uživatel neexistuje. Nejprve si vytvořte účet.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certifikát",
    "certificateStatusAutoRefreshHint": "Stav se automaticky obnovuje.",
    "loading": "Načítání",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Načítání analytiky",
    "restart": "Restartovat",
    "domains": "Domény",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Schéma",
-    "editInternalResourceDialogEnableSsl": "Povolit SSL",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Povolit šifrování SSL/TLS pro zabezpečené HTTPS připojení k cíli.",
    "editInternalResourceDialogDestination": "Místo určení",
    "editInternalResourceDialogDestinationHostDescription": "IP adresa nebo název hostitele zdroje v síti webu.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Schéma",
    "createInternalResourceDialogScheme": "Schéma",
-    "createInternalResourceDialogEnableSsl": "Povolit SSL",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Povolit šifrování SSL/TLS pro zabezpečené HTTPS připojení k cíli.",
    "createInternalResourceDialogDestination": "Místo určení",
    "createInternalResourceDialogDestinationHostDescription": "IP adresa nebo název hostitele zdroje v síti webu.",
@@ -2233,7 +2260,7 @@
        "description": "Spolehlivější a nízko udržovaný Pangolinův server s dalšími zvony a bičkami",
        "introTitle": "Spravovaný Pangolin",
        "introDescription": "je možnost nasazení určená pro lidi, kteří chtějí jednoduchost a spolehlivost při zachování soukromých a samoobslužných dat.",
-        "introDetail": "Pomocí této volby stále provozujete vlastní uzel Pangolin - tunely, SSL terminály a provoz všech pobytů na vašem serveru. Rozdíl spočívá v tom, že řízení a monitorování se řeší prostřednictvím našeho cloudového panelu, který odemkne řadu výhod:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Jednoduchý provoz",
            "description": "Není třeba spouštět svůj vlastní poštovní server nebo nastavit komplexní upozornění. Ze schránky dostanete upozornění na zdravotní kontrolu a výpadek."
--- a/messages/de-DE.json
+++ b/messages/de-DE.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Zu Ressource gehen",
    "resourceDelete": "Ressource löschen",
    "resourceDeleteConfirm": "Ressource löschen bestätigen",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Sichtbarkeit",
    "enabled": "Aktiviert",
    "disabled": "Deaktiviert",
@@ -630,7 +647,7 @@
    "createdAt": "Erstellt am",
    "proxyErrorInvalidHeader": "Ungültiger benutzerdefinierter Host-Header-Wert. Verwenden Sie das Domain-Namensformat oder speichern Sie leer, um den benutzerdefinierten Host-Header zu deaktivieren.",
    "proxyErrorTls": "Ungültiger TLS-Servername. Verwenden Sie das Domain-Namensformat oder speichern Sie leer, um den TLS-Servernamen zu entfernen.",
-    "proxyEnableSSL": "TLS aktivieren",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Aktiviere SSL/TLS-Verschlüsselung für sichere HTTPS-Verbindungen zu den Zielen.",
    "target": "Ziel",
    "configureTarget": "Ziele konfigurieren",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Es gab ein Problem bei der Verbindung zu {name}. Bitte kontaktieren Sie Ihren Administrator.",
    "idpErrorNotFound": "IdP nicht gefunden",
    "inviteInvalid": "Ungültige Einladung",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Der Einladungslink ist ungültig.",
    "inviteErrorWrongUser": "Einladung ist nicht für diesen Benutzer",
    "inviteErrorUserNotExists": "Benutzer existiert nicht. Bitte erstelle zuerst ein Konto.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Zertifikat",
    "certificateStatusAutoRefreshHint": "Der Status wird automatisch aktualisiert.",
    "loading": "Laden",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Analytik wird geladen",
    "restart": "Neustart",
    "domains": "Domänen",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Schema",
-    "editInternalResourceDialogEnableSsl": "TLS aktivieren",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "SSL/TLS-Verschlüsselung für sichere HTTPS-Verbindungen zum Ziel aktivieren.",
    "editInternalResourceDialogDestination": "Ziel",
    "editInternalResourceDialogDestinationHostDescription": "Die IP-Adresse oder der Hostname der Ressource im Netzwerk der Website.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Schema",
    "createInternalResourceDialogScheme": "Schema",
-    "createInternalResourceDialogEnableSsl": "TLS aktivieren",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "SSL/TLS-Verschlüsselung für sichere HTTPS-Verbindungen zum Ziel aktivieren.",
    "createInternalResourceDialogDestination": "Ziel",
    "createInternalResourceDialogDestinationHostDescription": "Die IP-Adresse oder der Hostname der Ressource im Netzwerk der Website.",
@@ -2233,7 +2260,7 @@
        "description": "Zuverlässiger und wartungsarmer Pangolin Server mit zusätzlichen Glocken und Pfeifen",
        "introTitle": "Verwalteter selbstgehosteter Pangolin",
        "introDescription": "ist eine Deployment-Option, die für Personen konzipiert wurde, die Einfachheit und zusätzliche Zuverlässigkeit wünschen, während sie ihre Daten privat und selbstgehostet halten.",
-        "introDetail": "Mit dieser Option haben Sie immer noch Ihren eigenen Pangolin-Knoten – Ihre Tunnel, TLS-Terminierung und Traffic bleiben auf Ihrem Server. Der Unterschied besteht darin, dass Verwaltung und Überwachung über unser Cloud-Dashboard abgewickelt werden, das eine Reihe von Vorteilen freischaltet:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Einfachere Operationen",
            "description": "Sie brauchen keinen eigenen Mail-Server auszuführen oder komplexe Warnungen einzurichten. Sie erhalten Gesundheitschecks und Ausfallwarnungen aus dem Box."
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -255,23 +255,6 @@
    "resourceGoTo": "Go to Resource",
    "resourceDelete": "Delete Resource",
    "resourceDeleteConfirm": "Confirm Delete Resource",
-    "labelDelete": "Delete Label",
-    "labelAdd": "Add Label",
-    "labelCreateSuccessMessage": "Label Created Successfully",
-    "labelEditSuccessMessage": "Label Modified Successfully",
-    "labelNameField": "Label Name",
-    "labelColorField": "Label Color",
-    "labelPlaceholder": "Ex: homelab",
-    "labelCreate": "Create Label",
-    "createLabelDialogTitle": "Create Label",
-    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
-    "labelEdit": "Edit Label",
-    "editLabelDialogTitle": "Update Label",
-    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
-    "labelDeleteConfirm": "Confirm Delete Label",
-    "labelErrorDelete": "Failed to delete label",
-    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
-    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Visibility",
    "enabled": "Enabled",
    "disabled": "Disabled",
@@ -1157,15 +1140,6 @@
    "idpErrorConnectingTo": "There was a problem connecting to {name}. Please contact your administrator.",
    "idpErrorNotFound": "IdP not found",
    "inviteInvalid": "Invalid Invite",
-    "labels": "Labels",
-    "orgLabelsDescription": "Manage labels in this organization.",
-    "addLabels": "Add labels",
-    "siteLabelsTab": "Labels",
-    "siteLabelsDescription": "Manage labels associated with this site.",
-    "labelsNotFound": "Labels not found",
-    "labelSearch": "Search labels",
-    "selectColor": "Select color",
-    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "The invite link is invalid.",
    "inviteErrorWrongUser": "Invite is not for this user",
    "inviteErrorUserNotExists": "User does not exist. Please create an account first.",
@@ -1601,17 +1575,7 @@
    "contents": "Contents",
    "parsedContents": "Parsed Contents (Read Only)",
    "enableDockerSocket": "Enable Docker Blueprint",
-    "enableDockerSocketDescription": "Enable Docker Socket label scraping for blueprint labels. Socket path must be provided to the site connector. Read about how this works in <docsLink>the documentation</docsLink>.",
-    "newtAutoUpdate": "Enable Site Auto-Update",
-    "newtAutoUpdateDescription": "When enabled, site connectors will automatically update to the latest version when a new release is available.",
-    "siteAutoUpdate": "Site Auto-Update",
-    "siteAutoUpdateLabel": "Enable Auto-Update",
-    "siteAutoUpdateDescription": "Control whether this site's connector automatically downloads the latest version.",
-    "siteAutoUpdateOrgDefault": "Organization default: {state}",
-    "siteAutoUpdateOverriding": "Overriding organization setting",
-    "siteAutoUpdateResetToOrg": "Reset to Organization Default",
-    "siteAutoUpdateEnabled": "enabled",
-    "siteAutoUpdateDisabled": "disabled",
+    "enableDockerSocketDescription": "Enable Docker Socket label scraping for blueprint labels. Socket path must be provided to Newt. Read about how this works in <docsLink>the documentation</docsLink>.",
    "viewDockerContainers": "View Docker Containers",
    "containersIn": "Containers in {siteName}",
    "selectContainerDescription": "Select any container to use as a hostname for this target. Click a port to use a port.",
--- a/messages/es-ES.json
+++ b/messages/es-ES.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Ir a Recurso",
    "resourceDelete": "Eliminar Recurso",
    "resourceDeleteConfirm": "Confirmar Borrar Recurso",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Visibilidad",
    "enabled": "Activado",
    "disabled": "Deshabilitado",
@@ -630,7 +647,7 @@
    "createdAt": "Creado el",
    "proxyErrorInvalidHeader": "Valor de cabecera de host personalizado no válido. Utilice el formato de nombre de dominio, o guarde en blanco para desestablecer cabecera de host personalizada.",
    "proxyErrorTls": "Nombre de servidor TLS inválido. Utilice el formato de nombre de dominio o guarde en blanco para eliminar el nombre de servidor TLS.",
-    "proxyEnableSSL": "Activar TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Habilita el cifrado SSL/TLS para conexiones seguras HTTPS a los objetivos.",
    "target": "Target",
    "configureTarget": "Configurar objetivos",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Hubo un problema al conectar con {name}. Por favor, póngase en contacto con su administrador.",
    "idpErrorNotFound": "IdP no encontrado",
    "inviteInvalid": "Invitación inválida",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "El enlace de invitación no es válido.",
    "inviteErrorWrongUser": "La invitación no es para este usuario",
    "inviteErrorUserNotExists": "El usuario no existe. Por favor, cree una cuenta primero.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certificado",
    "certificateStatusAutoRefreshHint": "El estado se actualiza automáticamente.",
    "loading": "Cargando",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Cargando analíticas",
    "restart": "Reiniciar",
    "domains": "Dominios",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Esquema",
-    "editInternalResourceDialogEnableSsl": "Activar TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Habilitar cifrado SSL/TLS para conexiones HTTPS seguras al destino.",
    "editInternalResourceDialogDestination": "Destino",
    "editInternalResourceDialogDestinationHostDescription": "La dirección IP o nombre de host del recurso en la red del sitio.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Esquema",
    "createInternalResourceDialogScheme": "Esquema",
-    "createInternalResourceDialogEnableSsl": "Activar TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Habilitar cifrado SSL/TLS para conexiones HTTPS seguras al destino.",
    "createInternalResourceDialogDestination": "Destino",
    "createInternalResourceDialogDestinationHostDescription": "La dirección IP o nombre de host del recurso en la red del sitio.",
@@ -2233,7 +2260,7 @@
        "description": "Servidor Pangolin autoalojado más fiable y de bajo mantenimiento con campanas y silbidos extra",
        "introTitle": "Pangolin autogestionado",
        "introDescription": "es una opción de despliegue diseñada para personas que quieren simplicidad y fiabilidad extra mientras mantienen sus datos privados y autoalojados.",
-        "introDetail": "Con esta opción, todavía ejecuta su propio nodo Pangolin, sus túneles, terminación TLS y tráfico permanecen en su servidor. La diferencia es que la gestión y el control se gestionan a través de nuestro panel de control en la nube, que desbloquea una serie de ventajas:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Operaciones simples",
            "description": "No necesitas ejecutar tu propio servidor de correo o configurar alertas complejas. Recibirás cheques de salud y alertas de tiempo de inactividad."
--- a/messages/fr-FR.json
+++ b/messages/fr-FR.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Aller à la ressource",
    "resourceDelete": "Supprimer la ressource",
    "resourceDeleteConfirm": "Confirmer la suppression de la ressource",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Visibilité",
    "enabled": "Activé",
    "disabled": "Désactivé",
@@ -630,7 +647,7 @@
    "createdAt": "Créé le",
    "proxyErrorInvalidHeader": "Valeur d'en-tête Host personnalisée invalide. Utilisez le format de nom de domaine, ou laissez vide pour désactiver l'en-tête Host personnalisé.",
    "proxyErrorTls": "Nom de serveur TLS invalide. Utilisez le format de nom de domaine, ou laissez vide pour supprimer le nom de serveur TLS.",
-    "proxyEnableSSL": "Activer TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Activer le cryptage SSL/TLS pour des connexions HTTPS sécurisées vers les cibles.",
    "target": "Cible",
    "configureTarget": "Configurer les cibles",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Un problème est survenu lors de la connexion à {name}. Veuillez contacter votre administrateur.",
    "idpErrorNotFound": "IdP introuvable",
    "inviteInvalid": "Invitation invalide",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Le lien d'invitation n'est pas valide.",
    "inviteErrorWrongUser": "L'invitation n'est pas pour cet utilisateur",
    "inviteErrorUserNotExists": "L'utilisateur n'existe pas. Veuillez d'abord créer un compte.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certificat",
    "certificateStatusAutoRefreshHint": "L'état se rafraîchit automatiquement.",
    "loading": "Chargement",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Chargement de l'analyse",
    "restart": "Redémarrer",
    "domains": "Domaines",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Méthode HTTP",
-    "editInternalResourceDialogEnableSsl": "Activer TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Activer le cryptage SSL/TLS pour des connexions HTTPS sécurisées vers la destination.",
    "editInternalResourceDialogDestination": "Destination",
    "editInternalResourceDialogDestinationHostDescription": "L'adresse IP ou le nom d'hôte de la ressource sur le réseau du site.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Méthode HTTP",
    "createInternalResourceDialogScheme": "Méthode HTTP",
-    "createInternalResourceDialogEnableSsl": "Activer TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Activer le cryptage SSL/TLS pour des connexions HTTPS sécurisées vers la destination.",
    "createInternalResourceDialogDestination": "Destination",
    "createInternalResourceDialogDestinationHostDescription": "L'adresse IP ou le nom d'hôte de la ressource sur le réseau du site.",
@@ -2233,7 +2260,7 @@
        "description": "Serveur Pangolin auto-hébergé avec des cloches et des sifflets supplémentaires",
        "introTitle": "Pangolin auto-hébergé géré",
        "introDescription": "est une option de déploiement conçue pour les personnes qui veulent de la simplicité et de la fiabilité tout en gardant leurs données privées et auto-hébergées.",
-        "introDetail": "Avec cette option, vous exécutez toujours votre propre nœud Pangolin - vos tunnels, la terminaison TLS et le trafic restent sur votre serveur. La différence est que la gestion et la surveillance sont gérées via notre tableau de bord du cloud, qui déverrouille un certain nombre d'avantages :",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Opérations plus simples",
            "description": "Pas besoin de faire tourner votre propre serveur de messagerie ou de configurer des alertes complexes. Vous obtiendrez des contrôles de santé et des alertes de temps d'arrêt par la suite."
--- a/messages/it-IT.json
+++ b/messages/it-IT.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Vai alla Risorsa",
    "resourceDelete": "Elimina Risorsa",
    "resourceDeleteConfirm": "Conferma Eliminazione Risorsa",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Visibilità",
    "enabled": "Abilitato",
    "disabled": "Disabilitato",
@@ -630,7 +647,7 @@
    "createdAt": "Creato Il",
    "proxyErrorInvalidHeader": "Valore dell'intestazione Host personalizzata non valido. Usa il formato nome dominio o salva vuoto per rimuovere l'intestazione Host personalizzata.",
    "proxyErrorTls": "Nome Server TLS non valido. Usa il formato nome dominio o salva vuoto per rimuovere il Nome Server TLS.",
-    "proxyEnableSSL": "Abilita TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Abilita la crittografia SSL/TLS per connessioni HTTPS sicure alle risorse interne target.",
    "target": "Target",
    "configureTarget": "Configura Risorse Interne",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Si è verificato un problema durante la connessione a {name}. Contatta il tuo amministratore.",
    "idpErrorNotFound": "IdP non trovato",
    "inviteInvalid": "Invito Non Valido",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Il link di invito non è valido.",
    "inviteErrorWrongUser": "L'invito non è per questo utente",
    "inviteErrorUserNotExists": "L'utente non esiste. Si prega di creare prima un account.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certificato",
    "certificateStatusAutoRefreshHint": "Lo stato si aggiorna automaticamente.",
    "loading": "Caricamento",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Caricamento Delle Analisi",
    "restart": "Riavvia",
    "domains": "Domini",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Metodo HTTP",
-    "editInternalResourceDialogEnableSsl": "Abilitare TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Abilita la crittografia SSL/TLS per connessioni HTTPS sicure alla destinazione.",
    "editInternalResourceDialogDestination": "Destinazione",
    "editInternalResourceDialogDestinationHostDescription": "L'indirizzo IP o il nome host della risorsa nella rete del sito.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Metodo HTTP",
    "createInternalResourceDialogScheme": "Metodo HTTP",
-    "createInternalResourceDialogEnableSsl": "Abilitare TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Abilita la crittografia SSL/TLS per connessioni HTTPS sicure alla destinazione.",
    "createInternalResourceDialogDestination": "Destinazione",
    "createInternalResourceDialogDestinationHostDescription": "L'indirizzo IP o il nome host della risorsa nella rete del sito.",
@@ -2233,7 +2260,7 @@
        "description": "Server Pangolin self-hosted più affidabile e a bassa manutenzione con campanelli e fischietti extra",
        "introTitle": "Managed Self-Hosted Pangolin",
        "introDescription": "è un'opzione di distribuzione progettata per le persone che vogliono la semplicità e l'affidabilità extra mantenendo i loro dati privati e self-hosted.",
-        "introDetail": "Con questa opzione, esegui ancora il tuo nodo Pangolin - i tunnel, la terminazione TLS e il traffico rimangono tutti sul tuo server. La differenza è che la gestione e il monitoraggio sono gestiti attraverso il nostro cruscotto cloud, che sblocca una serie di vantaggi:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Operazioni più semplici",
            "description": "Non è necessario eseguire il proprio server di posta o impostare un avviso complesso. Otterrai controlli di salute e avvisi di inattività fuori dalla casella."
--- a/messages/ko-KR.json
+++ b/messages/ko-KR.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "리소스로 이동",
    "resourceDelete": "리소스 삭제",
    "resourceDeleteConfirm": "리소스 삭제 확인",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "가시성",
    "enabled": "활성화됨",
    "disabled": "비활성화됨",
@@ -630,7 +647,7 @@
    "createdAt": "생성일",
    "proxyErrorInvalidHeader": "잘못된 사용자 정의 호스트 헤더 값입니다. 도메인 이름 형식을 사용하거나 사용자 정의 호스트 헤더를 해제하려면 비워 두십시오.",
    "proxyErrorTls": "유효하지 않은 TLS 서버 이름입니다. 도메인 이름 형식을 사용하거나 비워 두어 TLS 서버 이름을 제거하십시오.",
-    "proxyEnableSSL": "TLS 활성화",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "타겟과의 안전한 HTTPS 연결을 위한 SSL/TLS 암호화를 활성화하세요.",
    "target": "대상",
    "configureTarget": "대상 구성",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "{name}에 연결하는 데 문제가 발생했습니다. 관리자에게 문의하십시오.",
    "idpErrorNotFound": "IdP를 찾을 수 없습니다.",
    "inviteInvalid": "유효하지 않은 초대",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "초대 링크가 유효하지 않습니다.",
    "inviteErrorWrongUser": "이 초대는 이 사용자에게 해당되지 않습니다",
    "inviteErrorUserNotExists": "사용자가 존재하지 않습니다. 먼저 계정을 생성해 주세요.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "인증서",
    "certificateStatusAutoRefreshHint": "상태가 자동으로 새로 고쳐집니다.",
    "loading": "로딩 중",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "분석 로딩 중",
    "restart": "재시작",
    "domains": "도메인",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "스킴",
-    "editInternalResourceDialogEnableSsl": "TLS 활성화",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "목적지로의 안전한 HTTPS 연결을 위한 SSL/TLS 암호화 활성화.",
    "editInternalResourceDialogDestination": "대상지",
    "editInternalResourceDialogDestinationHostDescription": "사이트 네트워크의 자원 IP 주소입니다.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "스킴",
    "createInternalResourceDialogScheme": "스킴",
-    "createInternalResourceDialogEnableSsl": "TLS 활성화",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "목적지로의 안전한 HTTPS 연결을 위한 SSL/TLS 암호화 활성화.",
    "createInternalResourceDialogDestination": "대상지",
    "createInternalResourceDialogDestinationHostDescription": "사이트 네트워크의 자원 IP 주소입니다.",
@@ -2233,7 +2260,7 @@
        "description": "더 신뢰할 수 있고 낮은 유지보수의 자체 호스팅 팡골린 서버, 추가 기능 포함",
        "introTitle": "관리 자체 호스팅 팡골린",
        "introDescription": "는 자신의 데이터를 프라이빗하고 자체 호스팅을 유지하면서 더 간단하고 추가적인 신뢰성을 원하는 사람들을 위한 배포 옵션입니다.",
-        "introDetail": "이 옵션을 사용하면 여전히 자신의 팡골린 노드를 운영하고 - 터널, TLS 종료 및 트래픽 모두 서버에 유지됩니다. 차이점은 관리 및 모니터링이 클라우드 대시보드를 통해 처리되어 여러 혜택을 제공합니다.",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "더 간단한 운영",
            "description": "자체 메일 서버를 운영하거나 복잡한 경고를 설정할 필요가 없습니다. 기본적으로 상태 점검 및 다운타임 경고를 받을 수 있습니다."
--- a/messages/nb-NO.json
+++ b/messages/nb-NO.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Gå til ressurs",
    "resourceDelete": "Slett ressurs",
    "resourceDeleteConfirm": "Bekreft sletting av ressurs",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Synlighet",
    "enabled": "Aktivert",
    "disabled": "Deaktivert",
@@ -630,7 +647,7 @@
    "createdAt": "Opprettet",
    "proxyErrorInvalidHeader": "Ugyldig verdi for egendefinert vertsoverskrift. Bruk domenenavnformat, eller lagre tomt for å fjerne den egendefinerte vertsoverskriften.",
    "proxyErrorTls": "Ugyldig TLS-servernavn. Bruk domenenavnformat, eller la stå tomt for å fjerne TLS-servernavnet.",
-    "proxyEnableSSL": "Aktiver TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Aktivere SSL/TLS-kryptering for sikker HTTPS tilkobling til målene.",
    "target": "Target",
    "configureTarget": "Konfigurer mål",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Det oppstod et problem med å koble til {name}. Vennligst kontakt din administrator.",
    "idpErrorNotFound": "IdP ikke funnet",
    "inviteInvalid": "Ugyldig invitasjon",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Invitasjonslenken er ugyldig.",
    "inviteErrorWrongUser": "Invitasjonen er ikke for denne brukeren",
    "inviteErrorUserNotExists": "Brukeren eksisterer ikke. Vennligst opprett en konto først.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Sertifikat",
    "certificateStatusAutoRefreshHint": "Status oppdateres automatisk.",
    "loading": "Laster inn",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Laster inn analyser",
    "restart": "Start på nytt",
    "domains": "Domener",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Skjema",
-    "editInternalResourceDialogEnableSsl": "Aktiver TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Aktiver SSL/TLS-kryptering for sikre HTTPS-tilkoblinger til destinasjonen.",
    "editInternalResourceDialogDestination": "Destinasjon",
    "editInternalResourceDialogDestinationHostDescription": "IP-adressen eller vertsnavnet til ressursen på nettstedets nettverk.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Skjema",
    "createInternalResourceDialogScheme": "Skjema",
-    "createInternalResourceDialogEnableSsl": "Aktiver TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Aktiver SSL/TLS-kryptering for sikre HTTPS-tilkoblinger til destinasjonen.",
    "createInternalResourceDialogDestination": "Destinasjon",
    "createInternalResourceDialogDestinationHostDescription": "IP-adressen eller vertsnavnet til ressursen på nettstedets nettverk.",
@@ -2233,7 +2260,7 @@
        "description": "Sikre og lavvedlikeholdsservere, selvbetjente Pangolin med ekstra klokker, og understell",
        "introTitle": "Administrert Self-Hosted Pangolin",
        "introDescription": "er et alternativ for bruk utviklet for personer som ønsker enkel og ekstra pålitelighet mens de fortsatt holder sine data privat og selvdrevne.",
-        "introDetail": "Med dette valget kjører du fortsatt din egen Pangolin-node - tunneler, TLS-terminering og trafikken ligger på serveren din. Forskjellen er at behandling og overvåking håndteres gjennom vårt skydashbord, som låser opp en rekke fordeler:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Enklere operasjoner",
            "description": "Ingen grunn til å kjøre din egen e-postserver eller sette opp kompleks varsling. Du vil få helsesjekk og nedetid varsler ut av boksen."
--- a/messages/nl-NL.json
+++ b/messages/nl-NL.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Ga naar Resource",
    "resourceDelete": "Document verwijderen",
    "resourceDeleteConfirm": "Bevestig Verwijderen Document",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Zichtbaarheid",
    "enabled": "Ingeschakeld",
    "disabled": "Uitgeschakeld",
@@ -630,7 +647,7 @@
    "createdAt": "Aangemaakt op",
    "proxyErrorInvalidHeader": "Ongeldige aangepaste Header waarde. Gebruik het domeinnaam formaat, of sla leeg op om de aangepaste Host header ongedaan te maken.",
    "proxyErrorTls": "Ongeldige TLS servernaam. Gebruik de domeinnaam of sla leeg op om de TLS servernaam te verwijderen.",
-    "proxyEnableSSL": "TLS inschakelen",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "SSL/TLS-versleuteling inschakelen voor beveiligde HTTPS-verbindingen naar de doelen.",
    "target": "Target",
    "configureTarget": "Doelstellingen configureren",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Er was een probleem bij het verbinden met {name}. Neem contact op met uw beheerder.",
    "idpErrorNotFound": "IdP niet gevonden",
    "inviteInvalid": "Ongeldige uitnodiging",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Uitnodigingslink is ongeldig.",
    "inviteErrorWrongUser": "Uitnodiging is niet voor deze gebruiker",
    "inviteErrorUserNotExists": "Gebruiker bestaat niet. Maak eerst een account aan.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certificaat",
    "certificateStatusAutoRefreshHint": "Status ververst automatisch.",
    "loading": "Bezig met laden",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Laden van Analytics",
    "restart": "Herstarten",
    "domains": "Domeinen",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Schema",
-    "editInternalResourceDialogEnableSsl": "TLS inschakelen",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Schakel SSL/TLS-encryptie in voor beveiligde HTTPS-verbindingen met de bestemming.",
    "editInternalResourceDialogDestination": "Bestemming",
    "editInternalResourceDialogDestinationHostDescription": "Het IP-adres of de hostnaam van de bron op het netwerk van de site.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Schema",
    "createInternalResourceDialogScheme": "Schema",
-    "createInternalResourceDialogEnableSsl": "TLS inschakelen",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Schakel SSL/TLS-encryptie in voor beveiligde HTTPS-verbindingen met de bestemming.",
    "createInternalResourceDialogDestination": "Bestemming",
    "createInternalResourceDialogDestinationHostDescription": "Het IP-adres of de hostnaam van de bron op het netwerk van de site.",
@@ -2233,7 +2260,7 @@
        "description": "betrouwbaardere en slecht onderhouden Pangolin server met extra klokken en klokkenluiders",
        "introTitle": "Beheerde zelfgehoste pangolin",
        "introDescription": "is een implementatieoptie ontworpen voor mensen die eenvoud en extra betrouwbaarheid willen, terwijl hun gegevens privé en zelf georganiseerd blijven.",
-        "introDetail": "Met deze optie beheert u nog steeds uw eigen Pangolin node - uw tunnels, TLS-verbinding en verkeer alles op uw server. Het verschil is dat beheer en monitoring worden behandeld via onze cloud dashboard, wat een aantal voordelen oplevert:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Simpler operaties",
            "description": "Je hoeft geen eigen mailserver te draaien of complexe waarschuwingen in te stellen. Je krijgt gezondheidscontroles en downtime meldingen uit de box."
--- a/messages/pl-PL.json
+++ b/messages/pl-PL.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Przejdź do zasobu",
    "resourceDelete": "Usuń zasób",
    "resourceDeleteConfirm": "Potwierdź usunięcie zasobu",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Widoczność",
    "enabled": "Włączone",
    "disabled": "Wyłączone",
@@ -630,7 +647,7 @@
    "createdAt": "Utworzono",
    "proxyErrorInvalidHeader": "Nieprawidłowa wartość niestandardowego nagłówka hosta. Użyj formatu nazwy domeny lub zapisz pusty, aby usunąć niestandardowy nagłówek hosta.",
    "proxyErrorTls": "Nieprawidłowa nazwa serwera TLS. Użyj formatu nazwy domeny lub zapisz pusty, aby usunąć nazwę serwera TLS.",
-    "proxyEnableSSL": "Włącz TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Włącz szyfrowanie SSL/TLS dla bezpiecznych połączeń HTTPS z celami.",
    "target": "Target",
    "configureTarget": "Konfiguruj Targety",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Wystąpił problem z połączeniem z {name}. Skontaktuj się z administratorem.",
    "idpErrorNotFound": "Nie znaleziono IdP",
    "inviteInvalid": "Nieprawidłowe zaproszenie",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Link zapraszający jest nieprawidłowy.",
    "inviteErrorWrongUser": "Zaproszenie nie jest dla tego użytkownika",
    "inviteErrorUserNotExists": "Użytkownik nie istnieje. Najpierw utwórz konto.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certyfikat",
    "certificateStatusAutoRefreshHint": "Status odświeża się automatycznie.",
    "loading": "Ładowanie",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Ładowanie Analityki",
    "restart": "Uruchom ponownie",
    "domains": "Domeny",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Schemat",
-    "editInternalResourceDialogEnableSsl": "Włącz TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Włącz szyfrowanie SSL/TLS dla bezpiecznych połączeń HTTPS z miejscem docelowym.",
    "editInternalResourceDialogDestination": "Miejsce docelowe",
    "editInternalResourceDialogDestinationHostDescription": "Adres IP lub nazwa hosta zasobu w sieci witryny.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Schemat",
    "createInternalResourceDialogScheme": "Schemat",
-    "createInternalResourceDialogEnableSsl": "Włącz TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Włącz szyfrowanie SSL/TLS dla bezpiecznych połączeń HTTPS z miejscem docelowym.",
    "createInternalResourceDialogDestination": "Miejsce docelowe",
    "createInternalResourceDialogDestinationHostDescription": "Adres IP lub nazwa hosta zasobu w sieci witryny.",
@@ -2233,7 +2260,7 @@
        "description": "Większa niezawodność i niska konserwacja serwera Pangolin z dodatkowymi dzwonkami i sygnałami",
        "introTitle": "Zarządzany samowystarczalny Pangolin",
        "introDescription": "jest opcją wdrażania zaprojektowaną dla osób, które chcą prostoty i dodatkowej niezawodności, przy jednoczesnym utrzymaniu swoich danych prywatnych i samodzielnych.",
-        "introDetail": "Z tą opcją nadal obsługujesz swój własny węzeł Pangolin - tunele, zakończenie TLS i ruch na Twoim serwerze. Różnica polega na tym, że zarządzanie i monitorowanie odbywa się za pomocą naszej tablicy rozdzielczej, która odblokowuje szereg korzyści:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Uproszczone operacje",
            "description": "Nie ma potrzeby uruchamiania własnego serwera pocztowego lub ustawiania skomplikowanych powiadomień. Będziesz mieć kontrolę zdrowia i powiadomienia o przestoju."
--- a/messages/pt-PT.json
+++ b/messages/pt-PT.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Ir para o Recurso",
    "resourceDelete": "Excluir Recurso",
    "resourceDeleteConfirm": "Confirmar que pretende apagar o  recurso",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Visibilidade",
    "enabled": "Ativado",
    "disabled": "Desabilitado",
@@ -630,7 +647,7 @@
    "createdAt": "Criado Em",
    "proxyErrorInvalidHeader": "Valor do cabeçalho Host personalizado inválido. Use o formato de nome de domínio ou salve vazio para remover o cabeçalho Host personalizado.",
    "proxyErrorTls": "Nome do Servidor TLS inválido. Use o formato de nome de domínio ou salve vazio para remover o Nome do Servidor TLS.",
-    "proxyEnableSSL": "Habilitar TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Habilitar criptografia SSL/TLS para conexões HTTPS seguras aos alvos.",
    "target": "Target",
    "configureTarget": "Configurar Alvos",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Ocorreu um problema ao ligar a {name}. Por favor, contacte o seu administrador.",
    "idpErrorNotFound": "IdP não encontrado",
    "inviteInvalid": "Convite Inválido",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "O link do convite é inválido.",
    "inviteErrorWrongUser": "O convite não é para este utilizador",
    "inviteErrorUserNotExists": "O utilizador não existe. Por favor, crie uma conta primeiro.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Certificado",
    "certificateStatusAutoRefreshHint": "Status atualiza automaticamente.",
    "loading": "Carregando",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Carregando Analytics",
    "restart": "Reiniciar",
    "domains": "Domínios",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Esquema",
-    "editInternalResourceDialogEnableSsl": "Ativar TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Ativar criptografia SSL/TLS para conexões HTTPS seguras com o destino.",
    "editInternalResourceDialogDestination": "Destino",
    "editInternalResourceDialogDestinationHostDescription": "O endereço IP ou o nome do host do recurso na rede do site.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Esquema",
    "createInternalResourceDialogScheme": "Esquema",
-    "createInternalResourceDialogEnableSsl": "Ativar TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Ativar criptografia SSL/TLS para conexões HTTPS seguras com o destino.",
    "createInternalResourceDialogDestination": "Destino",
    "createInternalResourceDialogDestinationHostDescription": "O endereço IP ou o nome do host do recurso na rede do site.",
@@ -2233,7 +2260,7 @@
        "description": "Servidor Pangolin auto-hospedado mais confiável e com baixa manutenção com sinos extras e assobiamentos",
        "introTitle": "Pangolin Auto-Hospedado Gerenciado",
        "introDescription": "é uma opção de implantação projetada para pessoas que querem simplicidade e confiança adicional, mantendo os seus dados privados e auto-hospedados.",
-        "introDetail": "Com esta opção, você ainda roda seu próprio nó Pangolin - seus túneis, terminação TLS e tráfego todos permanecem no seu servidor. A diferença é que a gestão e a monitorização são geridos através do nosso painel de nuvem, que desbloqueia vários benefícios:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Operações simples",
            "description": "Não é necessário executar o seu próprio servidor de e-mail ou configurar um alerta complexo. Você receberá fora de caixa verificações de saúde e alertas de tempo de inatividade."
--- a/messages/ru-RU.json
+++ b/messages/ru-RU.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Перейти к ресурсу",
    "resourceDelete": "Удалить ресурс",
    "resourceDeleteConfirm": "Подтвердить удаление",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Видимость",
    "enabled": "Включено",
    "disabled": "Отключено",
@@ -630,7 +647,7 @@
    "createdAt": "Создано в",
    "proxyErrorInvalidHeader": "Неверное значение пользовательского заголовка Host. Используйте формат доменного имени или оставьте пустым для сброса пользовательского заголовка Host.",
    "proxyErrorTls": "Неверное имя TLS сервера. Используйте формат доменного имени или оставьте пустым для удаления имени TLS сервера.",
-    "proxyEnableSSL": "Включить TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Включить шифрование SSL/TLS для безопасных HTTPS соединений с целями.",
    "target": "Target",
    "configureTarget": "Настроить адресаты",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "Возникла проблема при подключении к {name}. Пожалуйста, свяжитесь с вашим администратором.",
    "idpErrorNotFound": "IdP не найден",
    "inviteInvalid": "Недействительное приглашение",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Ссылка на приглашение недействительна.",
    "inviteErrorWrongUser": "Приглашение не для этого пользователя",
    "inviteErrorUserNotExists": "Пользователь не существует. Пожалуйста, сначала создайте учетную запись.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Сертификат",
    "certificateStatusAutoRefreshHint": "Статус обновляется автоматически.",
    "loading": "Загрузка",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Загрузка аналитики",
    "restart": "Перезагрузка",
    "domains": "Домены",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Схема",
-    "editInternalResourceDialogEnableSsl": "Включить TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Включите шифрование SSL/TLS для защищенных HTTPS соединений с конечной точкой.",
    "editInternalResourceDialogDestination": "Пункт назначения",
    "editInternalResourceDialogDestinationHostDescription": "IP адрес или имя хоста ресурса в сети сайта.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Схема",
    "createInternalResourceDialogScheme": "Схема",
-    "createInternalResourceDialogEnableSsl": "Включить TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Включите SSL/TLS шифрование для защищенных HTTPS соединений с конечной точкой.",
    "createInternalResourceDialogDestination": "Пункт назначения",
    "createInternalResourceDialogDestinationHostDescription": "IP адрес или имя хоста ресурса в сети сайта.",
@@ -2233,7 +2260,7 @@
        "description": "Более надежный и низко обслуживаемый сервер Pangolin с дополнительными колокольнями и свистками",
        "introTitle": "Управляемый Само-Хост Панголина",
        "introDescription": "- это вариант развертывания, предназначенный для людей, которые хотят простоты и надёжности, сохраняя при этом свои данные конфиденциальными и самостоятельными.",
-        "introDetail": "С помощью этой опции вы по-прежнему используете узел Pangolin - туннели, TLS, и весь остающийся на вашем сервере. Разница заключается в том, что управление и мониторинг осуществляются через нашу панель инструментов из облака, которая открывает ряд преимуществ:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Более простые операции",
            "description": "Не нужно запускать свой собственный почтовый сервер или настроить комплексное оповещение. Вы будете получать проверки состояния здоровья и оповещения о неисправностях из коробки."
--- a/messages/tr-TR.json
+++ b/messages/tr-TR.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "Kaynağa Git",
    "resourceDelete": "Kaynağı Sil",
    "resourceDeleteConfirm": "Kaynak Silmeyi Onayla",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "Görünürlük",
    "enabled": "Etkin",
    "disabled": "Devre Dışı",
@@ -630,7 +647,7 @@
    "createdAt": "Oluşturulma Tarihi",
    "proxyErrorInvalidHeader": "Geçersiz özel Ana Bilgisayar Başlığı değeri. Alan adı formatını kullanın veya özel Ana Bilgisayar Başlığını ayarlamak için boş bırakın.",
    "proxyErrorTls": "Geçersiz TLS Sunucu Adı. Alan adı formatını kullanın veya TLS Sunucu Adını kaldırmak için boş bırakılsın.",
-    "proxyEnableSSL": "TLS Etkinleştir",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "Hedeflere güvenli HTTPS bağlantıları için SSL/TLS şifrelemesini etkinleştirin.",
    "target": "Hedef",
    "configureTarget": "Hedefleri Yapılandır",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "{name} ile bağlantı kurarken bir sorun meydana geldi. Lütfen yöneticiye danışın.",
    "idpErrorNotFound": "IdP bulunamadı",
    "inviteInvalid": "Geçersiz Davet",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "Davet bağlantısı geçersiz.",
    "inviteErrorWrongUser": "Davet bu kullanıcı için değil",
    "inviteErrorUserNotExists": "Kullanıcı mevcut değil. Lütfen önce bir hesap oluşturun.",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "Sertifika",
    "certificateStatusAutoRefreshHint": "Durum otomatik olarak yenilenir.",
    "loading": "Yükleniyor",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "Analiz Yükleniyor",
    "restart": "Yeniden Başlat",
    "domains": "Alan Adları",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "Şema",
-    "editInternalResourceDialogEnableSsl": "TLS Etkinleştir",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "Hedefe güvenli HTTPS bağlantıları için SSL/TLS şifrelemeyi etkinleştirin.",
    "editInternalResourceDialogDestination": "Hedef",
    "editInternalResourceDialogDestinationHostDescription": "Site ağındaki kaynağın IP adresi veya ana bilgisayar adı.",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "Şema",
    "createInternalResourceDialogScheme": "Şema",
-    "createInternalResourceDialogEnableSsl": "TLS'yi Etkinleştir",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "Hedefe güvenli HTTPS bağlantıları için SSL/TLS şifrelemeyi etkinleştirin.",
    "createInternalResourceDialogDestination": "Hedef",
    "createInternalResourceDialogDestinationHostDescription": "Site ağındaki kaynağın IP adresi veya ana bilgisayar adı.",
@@ -2233,7 +2260,7 @@
        "description": "Daha güvenilir ve düşük bakım gerektiren, ekstra özelliklere sahip kendi kendine barındırabileceğiniz Pangolin sunucusu",
        "introTitle": "Yönetilen Kendi Kendine Barındırılan Pangolin",
        "introDescription": "Bu, basitlik ve ekstra güvenilirlik arayan, ancak verilerini gizli tutmak ve kendi sunucularında barındırmak isteyen kişiler için tasarlanmış bir dağıtım seçeneğidir.",
-        "introDetail": "Bu seçenekle, kendi Pangolin düğümünüzü çalıştırmaya devam edersiniz - tünelleriniz, TLS bitişiniz ve trafiğiniz tamamen sunucunuzda kalır. Fark, yönetim ve izlemeyi bulut panomuz üzerinden gerçekleştiririz, bu da bir dizi avantaj sağlar:",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "Daha basit işlemler",
            "description": "Kendi e-posta sunucunuzu çalıştırmanıza veya karmaşık uyarılar kurmanıza gerek yok. Sağlık kontrolleri ve kesinti uyarılarını kutudan çıktığı gibi alırsınız."
--- a/messages/zh-CN.json
+++ b/messages/zh-CN.json
@@ -255,6 +255,23 @@
    "resourceGoTo": "转到资源",
    "resourceDelete": "删除资源",
    "resourceDeleteConfirm": "确认删除资源",
+    "labelDelete": "Delete Label",
+    "labelAdd": "Add Label",
+    "labelCreateSuccessMessage": "Label Created Successfully",
+    "labelEditSuccessMessage": "Label Modified Successfully",
+    "labelNameField": "Label Name",
+    "labelColorField": "Label Color",
+    "labelPlaceholder": "Ex: homelab",
+    "labelCreate": "Create Label",
+    "createLabelDialogTitle": "Create Label",
+    "createLabelDialogDescription": "Create a new label that can be attached to this organization",
+    "labelEdit": "Edit Label",
+    "editLabelDialogTitle": "Update Label",
+    "editLabelDialogDescription": "Edit a new label that can be attached to this organization",
+    "labelDeleteConfirm": "Confirm Delete Label",
+    "labelErrorDelete": "Failed to delete label",
+    "labelMessageRemove": "This action is permanent. All sites, resources, and clients tagged with this label will be untagged.",
+    "labelQuestionRemove": "Are you sure you want to remove the label from the organization?",
    "visibility": "可见性",
    "enabled": "已启用",
    "disabled": "已禁用",
@@ -630,7 +647,7 @@
    "createdAt": "创建于",
    "proxyErrorInvalidHeader": "无效的自定义主机头值。使用域名格式，或将空保存为取消自定义主机头。",
    "proxyErrorTls": "无效的 TLS 服务器名称。使用域名格式，或保存空以删除 TLS 服务器名称。",
-    "proxyEnableSSL": "启用 TLS",
+    "proxyEnableSSL": "Enable TLS",
    "proxyEnableSSLDescription": "启用 SSL/TLS 加密以确保目标的 HTTPS 连接。",
    "target": "Target",
    "configureTarget": "配置目标",
@@ -1140,6 +1157,15 @@
    "idpErrorConnectingTo": "无法连接到 {name}，请联系管理员协助处理。",
    "idpErrorNotFound": "找不到 IdP",
    "inviteInvalid": "无效邀请",
+    "labels": "Labels",
+    "orgLabelsDescription": "Manage labels in this organization.",
+    "addLabels": "Add labels",
+    "siteLabelsTab": "Labels",
+    "siteLabelsDescription": "Manage labels associated with this site.",
+    "labelsNotFound": "Labels not found",
+    "labelSearch": "Search labels",
+    "selectColor": "Select color",
+    "createNewLabel": "Create new org label \"{label}\"",
    "inviteInvalidDescription": "邀请链接无效。",
    "inviteErrorWrongUser": "邀请不是该用户的",
    "inviteErrorUserNotExists": "用户不存在。请先创建帐户。",
@@ -1620,6 +1646,7 @@
    "certificateStatus": "证书",
    "certificateStatusAutoRefreshHint": "状态自动刷新。",
    "loading": "加载中",
+    "loadingEllipsis": "Loading...",
    "loadingAnalytics": "加载分析",
    "restart": "重启",
    "domains": "域",
@@ -2050,7 +2077,7 @@
    "editInternalResourceDialogModeHttp": "HTTP",
    "editInternalResourceDialogModeHttps": "HTTPS",
    "editInternalResourceDialogScheme": "方案",
-    "editInternalResourceDialogEnableSsl": "启用 TLS",
+    "editInternalResourceDialogEnableSsl": "Enable TLS",
    "editInternalResourceDialogEnableSslDescription": "为目标的安全 HTTPS 连接启用 SSL/TLS 加密。",
    "editInternalResourceDialogDestination": "目标",
    "editInternalResourceDialogDestinationHostDescription": "站点网络上资源的 IP 地址或主机名。",
@@ -2100,7 +2127,7 @@
    "createInternalResourceDialogModeHttps": "HTTPS",
    "scheme": "方案",
    "createInternalResourceDialogScheme": "方案",
-    "createInternalResourceDialogEnableSsl": "启用 TLS",
+    "createInternalResourceDialogEnableSsl": "Enable TLS",
    "createInternalResourceDialogEnableSslDescription": "为目标的安全 HTTPS 连接启用 SSL/TLS 加密。",
    "createInternalResourceDialogDestination": "目标",
    "createInternalResourceDialogDestinationHostDescription": "站点网络上资源的 IP 地址或主机名。",
@@ -2233,7 +2260,7 @@
        "description": "更可靠和低维护自我托管的 Pangolin 服务器，带有额外的铃声和告密器",
        "introTitle": "托管自托管的潘戈林公司",
        "introDescription": "这是一种部署选择，为那些希望简洁和额外可靠的人设计，同时仍然保持他们的数据的私密性和自我托管性。",
-        "introDetail": "通过此选项，您仍然运行您自己的 Pangolin 节点 - - 您的隧道、TLS 终止，并且流量在您的服务器上保持所有状态。 不同之处在于，管理和监测是通过我们的云层仪表板进行的，该仪表板开启了一些好处：",
+        "introDetail": "With this option, you still run your own Pangolin node - your tunnels, TLS termination, and traffic all stay on your server. The difference is that management and monitoring are handled through our cloud dashboard, which unlocks a number of benefits:",
        "benefitSimplerOperations": {
            "title": "简单的操作",
            "description": "无需运行您自己的邮件服务器或设置复杂的警报。您将从方框中获得健康检查和下限提醒。"
--- a/server/auth/actions.ts
+++ b/server/auth/actions.ts
@@ -148,12 +148,6 @@ export enum ActionsEnum {
    updateAlertRule = "updateAlertRule",
    deleteAlertRule = "deleteAlertRule",
    listAlertRules = "listAlertRules",
-    listOrgLabels = "listOrgLabels",
-    createOrgLabel = "createOrgLabel",
-    updateOrgLabel = "updateOrgLabel",
-    deleteOrgLabel = "deleteOrgLabel",
-    attachLabelToItem = "attachLabelToItem",
-    detachLabelFromItem = "detachLabelFromItem",
    getAlertRule = "getAlertRule",
    createHealthCheck = "createHealthCheck",
    updateHealthCheck = "updateHealthCheck",
--- a/server/db/pg/schema/schema.ts
+++ b/server/db/pg/schema/schema.ts
@@ -65,12 +65,7 @@ export const orgs = pgTable("orgs", {
    sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
    sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format)
    isBillingOrg: boolean("isBillingOrg"),
-    billingOrgId: varchar("billingOrgId"),
-    settingsEnableGlobalNewtAutoUpdate: boolean(
-        "settingsEnableGlobalNewtAutoUpdate"
-    )
-        .notNull()
-        .default(false)
+    billingOrgId: varchar("billingOrgId")
 });

 export const orgDomains = pgTable("orgDomains", {
@@ -108,10 +103,6 @@ export const sites = pgTable("sites", {
    lastHolePunch: bigint("lastHolePunch", { mode: "number" }),
    listenPort: integer("listenPort"),
    dockerSocketEnabled: boolean("dockerSocketEnabled").notNull().default(true),
-    autoUpdateEnabled: boolean("autoUpdateEnabled").notNull().default(false),
-    autoUpdateOverrideOrg: boolean("autoUpdateOverrideOrg")
-        .notNull()
-        .default(false),
    status: varchar("status")
        .$type<"pending" | "approved">()
        .default("approved")
@@ -171,89 +162,6 @@ export const resources = pgTable("resources", {
    wildcard: boolean("wildcard").notNull().default(false)
 });

-export const labels = pgTable("labels", {
-    labelId: serial("labelId").primaryKey(),
-    name: varchar("name").notNull(),
-    color: varchar("color").notNull(),
-    orgId: varchar("orgId")
-        .references(() => orgs.orgId, {
-            onDelete: "cascade"
-        })
-        .notNull()
-});
-
-export const siteLabels = pgTable(
-    "siteLabels",
-    {
-        siteLabelId: serial("siteLabelId").primaryKey(),
-        siteId: integer("siteId")
-            .references(() => sites.siteId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("site_label_uniq").on(t.siteId, t.labelId)]
-);
-
-export const resourceLabels = pgTable(
-    "resourceLabels",
-    {
-        resourceLabelId: serial("resourceLabelId").primaryKey(),
-        resourceId: integer("resourceId")
-            .references(() => resources.resourceId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("resource_label_uniq").on(t.resourceId, t.labelId)]
-);
-
-export const siteResourceLabels = pgTable(
-    "siteResourceLabels",
-    {
-        siteResourceLabelId: serial("siteResourceLabelId").primaryKey(),
-        siteResourceId: integer("siteResourceId")
-            .references(() => siteResources.siteResourceId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("site_resource_label_uniq").on(t.siteResourceId, t.labelId)]
-);
-
-export const clientLabels = pgTable(
-    "clientLabels",
-    {
-        clientLabelId: serial("clientLabelId").primaryKey(),
-        clientId: integer("clientId")
-            .references(() => clients.clientId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("client_label_uniq").on(t.clientId, t.labelId)]
-);
-
 export const targets = pgTable("targets", {
    targetId: serial("targetId").primaryKey(),
    resourceId: integer("resourceId")
@@ -288,11 +196,9 @@ export const targetHealthCheck = pgTable("targetHealthCheck", {
            onDelete: "cascade"
        })
        .notNull(),
-    siteId: integer("siteId")
-        .references(() => sites.siteId, {
-            onDelete: "cascade"
-        })
-        .notNull(),
+    siteId: integer("siteId").references(() => sites.siteId, {
+        onDelete: "cascade"
+    }).notNull(),
    name: varchar("name"),
    hcEnabled: boolean("hcEnabled").notNull().default(false),
    hcPath: varchar("hcPath"),
@@ -1191,30 +1097,19 @@ export const roundTripMessageTracker = pgTable("roundTripMessageTracker", {
    complete: boolean("complete").notNull().default(false)
 });

-export const statusHistory = pgTable(
-    "statusHistory",
-    {
-        id: serial("id").primaryKey(),
-        entityType: varchar("entityType").notNull(),
-        entityId: integer("entityId").notNull(),
-        orgId: varchar("orgId")
-            .notNull()
-            .references(() => orgs.orgId, { onDelete: "cascade" }),
-        status: varchar("status").notNull(),
-        timestamp: integer("timestamp").notNull()
-    },
-    (table) => [
-        index("idx_statusHistory_entity").on(
-            table.entityType,
-            table.entityId,
-            table.timestamp
-        ),
-        index("idx_statusHistory_org_timestamp").on(
-            table.orgId,
-            table.timestamp
-        )
-    ]
-);
+export const statusHistory = pgTable("statusHistory", {
+    id: serial("id").primaryKey(),
+    entityType: varchar("entityType").notNull(),
+    entityId: integer("entityId").notNull(),
+    orgId: varchar("orgId")
+        .notNull()
+        .references(() => orgs.orgId, { onDelete: "cascade" }),
+    status: varchar("status").notNull(),
+    timestamp: integer("timestamp").notNull(),
+}, (table) => [
+    index("idx_statusHistory_entity").on(table.entityType, table.entityId, table.timestamp),
+    index("idx_statusHistory_org_timestamp").on(table.orgId, table.timestamp),
+]);

 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;
@@ -1284,4 +1179,3 @@ export type RoundTripMessageTracker = InferSelectModel<
 >;
 export type Network = InferSelectModel<typeof networks>;
 export type StatusHistory = InferSelectModel<typeof statusHistory>;
-export type Label = InferSelectModel<typeof labels>;
--- a/server/db/sqlite/schema/schema.ts
+++ b/server/db/sqlite/schema/schema.ts
@@ -62,13 +62,7 @@ export const orgs = sqliteTable("orgs", {
    sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
    sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format)
    isBillingOrg: integer("isBillingOrg", { mode: "boolean" }),
-    billingOrgId: text("billingOrgId"),
-    settingsEnableGlobalNewtAutoUpdate: integer(
-        "settingsEnableGlobalNewtAutoUpdate",
-        { mode: "boolean" }
-    )
-        .notNull()
-        .default(false)
+    billingOrgId: text("billingOrgId")
 });

 export const userDomains = sqliteTable("userDomains", {
@@ -122,14 +116,6 @@ export const sites = sqliteTable("sites", {
    dockerSocketEnabled: integer("dockerSocketEnabled", { mode: "boolean" })
        .notNull()
        .default(true),
-    autoUpdateEnabled: integer("autoUpdateEnabled", { mode: "boolean" })
-        .notNull()
-        .default(false),
-    autoUpdateOverrideOrg: integer("autoUpdateOverrideOrg", {
-        mode: "boolean"
-    })
-        .notNull()
-        .default(false),
    status: text("status").$type<"pending" | "approved">().default("approved")
 });

@@ -197,95 +183,6 @@ export const resources = sqliteTable("resources", {
    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false)
 });

-export const labels = sqliteTable("labels", {
-    labelId: integer("labelId").primaryKey({ autoIncrement: true }),
-    name: text("name").notNull(),
-    color: text("color").notNull(),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
-            onDelete: "cascade"
-        })
-        .notNull()
-});
-
-export const siteLabels = sqliteTable(
-    "siteLabels",
-    {
-        siteLabelId: integer("siteLabelId").primaryKey({ autoIncrement: true }),
-        siteId: integer("siteId")
-            .references(() => sites.siteId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("site_label_uniq").on(t.siteId, t.labelId)]
-);
-
-export const resourceLabels = sqliteTable(
-    "resourceLabels",
-    {
-        resourceLabelId: integer("resourceLabelId").primaryKey({
-            autoIncrement: true
-        }),
-        resourceId: integer("resourceId")
-            .references(() => resources.resourceId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("resource_label_uniq").on(t.resourceId, t.labelId)]
-);
-
-export const siteResourceLabels = sqliteTable(
-    "siteResourceLabels",
-    {
-        siteResourceLabelId: integer("siteResourceLabelId").primaryKey({
-            autoIncrement: true
-        }),
-        siteResourceId: integer("siteResourceId")
-            .references(() => siteResources.siteResourceId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("site_resource_label_uniq").on(t.siteResourceId, t.labelId)]
-);
-
-export const clientLabels = sqliteTable(
-    "clientLabels",
-    {
-        clientLabelId: integer("clientLabelId").primaryKey({
-            autoIncrement: true
-        }),
-        clientId: integer("clientId")
-            .references(() => clients.clientId, {
-                onDelete: "cascade"
-            })
-            .notNull(),
-        labelId: integer("labelId")
-            .references(() => labels.labelId, {
-                onDelete: "cascade"
-            })
-            .notNull()
-    },
-    (t) => [unique("client_label_uniq").on(t.clientId, t.labelId)]
-);
-
 export const targets = sqliteTable("targets", {
    targetId: integer("targetId").primaryKey({ autoIncrement: true }),
    resourceId: integer("resourceId")
@@ -322,11 +219,9 @@ export const targetHealthCheck = sqliteTable("targetHealthCheck", {
            onDelete: "cascade"
        })
        .notNull(),
-    siteId: integer("siteId")
-        .references(() => sites.siteId, {
-            onDelete: "cascade"
-        })
-        .notNull(),
+    siteId: integer("siteId").references(() => sites.siteId, {
+        onDelete: "cascade"
+    }).notNull(),
    name: text("name"),
    hcEnabled: integer("hcEnabled", { mode: "boolean" })
        .notNull()
@@ -1301,30 +1196,19 @@ export const roundTripMessageTracker = sqliteTable("roundTripMessageTracker", {
    complete: integer("complete", { mode: "boolean" }).notNull().default(false)
 });

-export const statusHistory = sqliteTable(
-    "statusHistory",
-    {
-        id: integer("id").primaryKey({ autoIncrement: true }),
-        entityType: text("entityType").notNull(), // "site" | "healthCheck"
-        entityId: integer("entityId").notNull(), // siteId or targetHealthCheckId
-        orgId: text("orgId")
-            .notNull()
-            .references(() => orgs.orgId, { onDelete: "cascade" }),
-        status: text("status").notNull(), // "online"/"offline" for sites; "healthy"/"unhealthy"/"unknown" for healthChecks
-        timestamp: integer("timestamp").notNull() // unix epoch seconds
-    },
-    (table) => [
-        index("idx_statusHistory_entity").on(
-            table.entityType,
-            table.entityId,
-            table.timestamp
-        ),
-        index("idx_statusHistory_org_timestamp").on(
-            table.orgId,
-            table.timestamp
-        )
-    ]
-);
+export const statusHistory = sqliteTable("statusHistory", {
+    id: integer("id").primaryKey({ autoIncrement: true }),
+    entityType: text("entityType").notNull(), // "site" | "healthCheck"
+    entityId: integer("entityId").notNull(),  // siteId or targetHealthCheckId
+    orgId: text("orgId")
+        .notNull()
+        .references(() => orgs.orgId, { onDelete: "cascade" }),
+    status: text("status").notNull(), // "online"/"offline" for sites; "healthy"/"unhealthy"/"unknown" for healthChecks
+    timestamp: integer("timestamp").notNull(), // unix epoch seconds
+}, (table) => [
+    index("idx_statusHistory_entity").on(table.entityType, table.entityId, table.timestamp),
+    index("idx_statusHistory_org_timestamp").on(table.orgId, table.timestamp),
+]);

 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;
@@ -1394,4 +1278,3 @@ export type RoundTripMessageTracker = InferSelectModel<
    typeof roundTripMessageTracker
 >;
 export type StatusHistory = InferSelectModel<typeof statusHistory>;
-export type Label = InferSelectModel<typeof labels>;
--- a/server/lib/billing/tierMatrix.ts
+++ b/server/lib/billing/tierMatrix.ts
@@ -24,13 +24,10 @@ export enum TierFeature {
    DomainNamespaces = "domainNamespaces", // handle downgrade by removing custom domain namespaces
    StandaloneHealthChecks = "standaloneHealthChecks",
    AlertingRules = "alertingRules",
-    WildcardSubdomain = "wildcardSubdomain",
-    Labels = "labels",
-    NewtAutoUpdate = "newtAutoUpdate"
+    WildcardSubdomain = "wildcardSubdomain"
 }

 export const tierMatrix: Record<TierFeature, Tier[]> = {
-    [TierFeature.Labels]: ["tier2", "tier3", "enterprise"],
    [TierFeature.OrgOidc]: ["tier1", "tier2", "tier3", "enterprise"],
    [TierFeature.LoginPageDomain]: ["tier1", "tier2", "tier3", "enterprise"],
    [TierFeature.DeviceApprovals]: ["tier1", "tier3", "enterprise"],
@@ -69,6 +66,5 @@ export const tierMatrix: Record<TierFeature, Tier[]> = {
    [TierFeature.DomainNamespaces]: ["tier1", "tier2", "tier3", "enterprise"],
    [TierFeature.StandaloneHealthChecks]: ["tier3", "enterprise"],
    [TierFeature.AlertingRules]: ["tier3", "enterprise"],
-    [TierFeature.WildcardSubdomain]: ["tier1", "tier2", "tier3", "enterprise"],
-    [TierFeature.NewtAutoUpdate]: ["tier1", "tier2", "tier3", "enterprise"]
+    [TierFeature.WildcardSubdomain]: ["tier1", "tier2", "tier3", "enterprise"]
 };
--- a/server/lib/rebuildClientAssociations.ts
+++ b/server/lib/rebuildClientAssociations.ts
@@ -18,7 +18,7 @@ import {
    userOrgRoles,
    userSiteResources
 } from "@server/db";
-import { and, count, eq, inArray, ne } from "drizzle-orm";
+import { and, eq, inArray, ne } from "drizzle-orm";

 import { deletePeer as newtDeletePeer } from "@server/routers/newt/peers";
 import {
@@ -39,11 +39,6 @@ import {
    removePeerData,
    removeTargets as removeSubnetProxyTargets
 } from "@server/routers/client/targets";
-import { lockManager } from "#dynamic/lib/lock";
-
-// TTL for rebuild-association locks. These functions can fan out into many
-// peer/proxy updates, so give them a generous window.
-const REBUILD_ASSOCIATIONS_LOCK_TTL_MS = 120000;

 export async function getClientSiteResourceAccess(
    siteResource: SiteResource,
@@ -166,23 +161,6 @@ export async function rebuildClientAssociationsFromSiteResource(
        pubKey: string | null;
        subnet: string | null;
    }[];
-}> {
-    return await lockManager.withLock(
-        `rebuild-client-associations:site-resource:${siteResource.siteResourceId}`,
-        () => rebuildClientAssociationsFromSiteResourceImpl(siteResource, trx),
-        REBUILD_ASSOCIATIONS_LOCK_TTL_MS
-    );
-}
-
-async function rebuildClientAssociationsFromSiteResourceImpl(
-    siteResource: SiteResource,
-    trx: Transaction | typeof db = db
-): Promise<{
-    mergedAllClients: {
-        clientId: number;
-        pubKey: string | null;
-        subnet: string | null;
-    }[];
 }> {
    logger.debug(
        `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] START siteResourceId=${siteResource.siteResourceId} networkId=${siteResource.networkId} orgId=${siteResource.orgId}`
@@ -561,29 +539,6 @@ async function handleMessagesForSiteClients(
        }
    }

-    // get the number of sites on each of these clients so we can log it and make decisions about whether to send messages based on it
-    const clientSiteCounts: Record<number, number> = {};
-    if (clientsToProcess.size > 0) {
-        const clientIdsToProcess = Array.from(clientsToProcess.keys());
-        const siteCounts = await trx
-            .select({
-                clientId: clientSitesAssociationsCache.clientId,
-                siteCount: count(clientSitesAssociationsCache.siteId)
-            })
-            .from(clientSitesAssociationsCache)
-            .where(
-                inArray(
-                    clientSitesAssociationsCache.clientId,
-                    clientIdsToProcess
-                )
-            )
-            .groupBy(clientSitesAssociationsCache.clientId);
-
-        for (const row of siteCounts) {
-            clientSiteCounts[row.clientId] = Number(row.siteCount);
-        }
-    }
-
    for (const client of clientsToProcess.values()) {
        // UPDATE THE NEWT
        if (!client.subnet || !client.pubKey) {
@@ -627,14 +582,7 @@ async function handleMessagesForSiteClients(
        }

        if (isAdd) {
-            if (clientSiteCounts[client.clientId] > 250) {
-                // skip adding the peer if we have more than 250 sites because we are in jit mode anyway
-                logger.info(
-                    `rebuildClientAssociations: Client ${client.clientId} has ${clientSiteCounts[client.clientId]} sites so skipping adding peer to newt and olm because it is likely in jit mode`
-                );
-                continue;
-            }
-
+            // TODO: if we are in jit mode here should we really be sending this?
            await initPeerAddHandshake(
                // this will kick off the add peer process for the client
                client.clientId,
@@ -652,24 +600,9 @@ async function handleMessagesForSiteClients(
        exitNodeJobs.push(updateClientSiteDestinations(client, trx));
    }

-    Promise.all(exitNodeJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating client site destinations for site ${site.siteId}:`,
-            error
-        );
-    });
-    Promise.all(newtJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating Newt peers for site ${site.siteId}:`,
-            error
-        );
-    });
-    Promise.all(olmJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating Olm peers for site ${site.siteId}:`,
-            error
-        );
-    });
+    await Promise.all(exitNodeJobs);
+    await Promise.all(newtJobs); // do the servers first to make sure they are ready?
+    await Promise.all(olmJobs);
 }

 interface PeerDestination {
@@ -952,17 +885,6 @@ async function handleSubnetProxyTargetUpdates(
 export async function rebuildClientAssociationsFromClient(
    client: Client,
    trx: Transaction | typeof db = db
-): Promise<void> {
-    return await lockManager.withLock(
-        `rebuild-client-associations:client:${client.clientId}`,
-        () => rebuildClientAssociationsFromClientImpl(client, trx),
-        REBUILD_ASSOCIATIONS_LOCK_TTL_MS
-    );
-}
-
-async function rebuildClientAssociationsFromClientImpl(
-    client: Client,
-    trx: Transaction | typeof db = db
 ): Promise<void> {
    let newSiteResourceIds: number[] = [];

@@ -1235,12 +1157,6 @@ async function handleMessagesForClientSites(
    const olmJobs: Promise<any>[] = [];
    const exitNodeJobs: Promise<any>[] = [];

-    const totalSitesOnClient = await trx
-        .select({ count: count(clientSitesAssociationsCache.siteId) })
-        .from(clientSitesAssociationsCache)
-        .where(eq(clientSitesAssociationsCache.clientId, client.clientId))
-        .then((rows) => Number(rows[0].count));
-
    for (const siteData of sitesData) {
        const site = siteData.sites;
        const exitNode = siteData.exitNodes;
@@ -1301,14 +1217,7 @@ async function handleMessagesForClientSites(
                continue;
            }

-            if (totalSitesOnClient > 250) {
-                // skip adding the site if we have more than 250 because we are in jit mode anyway
-                logger.info(
-                    `rebuildClientAssociations: Client ${client.clientId} has ${totalSitesOnClient} sites so skipping adding peer to newt and olm because it is likely in jit mode`
-                );
-                continue;
-            }
-
+            // TODO: if we are in jit mode here should we really be sending this?
            await initPeerAddHandshake(
                // this will kick off the add peer process for the client
                client.clientId,
@@ -1336,24 +1245,9 @@ async function handleMessagesForClientSites(
        );
    }

-    Promise.all(exitNodeJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating client site destinations for client ${client.clientId}:`,
-            error
-        );
-    });
-    Promise.all(newtJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating Newt peers for client ${client.clientId}:`,
-            error
-        );
-    });
-    Promise.all(olmJobs).catch((error) => {
-        logger.error(
-            `rebuildClientAssociations: Error updating Olm peers for client ${client.clientId}:`,
-            error
-        );
-    });
+    await Promise.all(exitNodeJobs);
+    await Promise.all(newtJobs);
+    await Promise.all(olmJobs);
 }

 async function handleMessagesForClientResources(
@@ -1634,195 +1528,3 @@ async function handleMessagesForClientResources(

    await Promise.all([...proxyJobs, ...olmJobs]);
 }
-
-export type ClientAssociationsCacheVerification = {
-    clientId: number;
-    consistent: boolean;
-    // What permissions say the cache should contain
-    expectedSiteResourceIds: number[];
-    expectedSiteIds: number[];
-    // What the cache currently contains
-    actualSiteResourceIds: number[];
-    actualSiteIds: number[];
-    // Diff
-    missingSiteResourceIds: number[]; // present in expected, missing from cache
-    extraSiteResourceIds: number[]; // present in cache, not in expected
-    missingSiteIds: number[];
-    extraSiteIds: number[];
-};
-
-// verifyClientAssociationsCache walks the same permission-derivation logic as
-// rebuildClientAssociationsFromClient but does NOT modify the database. It
-// returns the expected vs actual cache contents and a boolean indicating
-// whether the cache is in sync with what permissions imply.
-export async function verifyClientAssociationsCache(
-    client: Client,
-    trx: Transaction | typeof db = db
-): Promise<ClientAssociationsCacheVerification> {
-    let newSiteResourceIds: number[] = [];
-
-    // 1. Direct client associations
-    const directSiteResources = await trx
-        .select({ siteResourceId: clientSiteResources.siteResourceId })
-        .from(clientSiteResources)
-        .innerJoin(
-            siteResources,
-            eq(siteResources.siteResourceId, clientSiteResources.siteResourceId)
-        )
-        .where(
-            and(
-                eq(clientSiteResources.clientId, client.clientId),
-                eq(siteResources.orgId, client.orgId)
-            )
-        );
-
-    newSiteResourceIds.push(
-        ...directSiteResources.map((r) => r.siteResourceId)
-    );
-
-    // 2. User-based and role-based access (if client has a userId)
-    if (client.userId) {
-        const userSiteResourceIds = await trx
-            .select({ siteResourceId: userSiteResources.siteResourceId })
-            .from(userSiteResources)
-            .innerJoin(
-                siteResources,
-                eq(
-                    siteResources.siteResourceId,
-                    userSiteResources.siteResourceId
-                )
-            )
-            .where(
-                and(
-                    eq(userSiteResources.userId, client.userId),
-                    eq(siteResources.orgId, client.orgId)
-                )
-            );
-
-        newSiteResourceIds.push(
-            ...userSiteResourceIds.map((r) => r.siteResourceId)
-        );
-
-        const roleIds = await trx
-            .select({ roleId: userOrgRoles.roleId })
-            .from(userOrgRoles)
-            .where(
-                and(
-                    eq(userOrgRoles.userId, client.userId),
-                    eq(userOrgRoles.orgId, client.orgId)
-                )
-            )
-            .then((rows) => rows.map((row) => row.roleId));
-
-        if (roleIds.length > 0) {
-            const roleSiteResourceIds = await trx
-                .select({ siteResourceId: roleSiteResources.siteResourceId })
-                .from(roleSiteResources)
-                .innerJoin(
-                    siteResources,
-                    eq(
-                        siteResources.siteResourceId,
-                        roleSiteResources.siteResourceId
-                    )
-                )
-                .where(
-                    and(
-                        inArray(roleSiteResources.roleId, roleIds),
-                        eq(siteResources.orgId, client.orgId)
-                    )
-                );
-
-            newSiteResourceIds.push(
-                ...roleSiteResourceIds.map((r) => r.siteResourceId)
-            );
-        }
-    }
-
-    newSiteResourceIds = Array.from(new Set(newSiteResourceIds));
-
-    const newSiteResources =
-        newSiteResourceIds.length > 0
-            ? await trx
-                  .select()
-                  .from(siteResources)
-                  .where(
-                      inArray(siteResources.siteResourceId, newSiteResourceIds)
-                  )
-            : [];
-
-    const networkIds = Array.from(
-        new Set(
-            newSiteResources
-                .map((sr) => sr.networkId)
-                .filter((id): id is number => id !== null)
-        )
-    );
-    const newSiteIds =
-        networkIds.length > 0
-            ? await trx
-                  .select({ siteId: siteNetworks.siteId })
-                  .from(siteNetworks)
-                  .where(inArray(siteNetworks.networkId, networkIds))
-                  .then((rows) =>
-                      Array.from(new Set(rows.map((r) => r.siteId)))
-                  )
-            : [];
-
-    // Read the existing cache state
-    const existingResourceAssociations = await trx
-        .select({
-            siteResourceId: clientSiteResourcesAssociationsCache.siteResourceId
-        })
-        .from(clientSiteResourcesAssociationsCache)
-        .where(
-            eq(clientSiteResourcesAssociationsCache.clientId, client.clientId)
-        );
-    const existingSiteResourceIds = existingResourceAssociations.map(
-        (r) => r.siteResourceId
-    );
-
-    const existingSiteAssociations = await trx
-        .select({ siteId: clientSitesAssociationsCache.siteId })
-        .from(clientSitesAssociationsCache)
-        .where(eq(clientSitesAssociationsCache.clientId, client.clientId));
-    const existingSiteIds = existingSiteAssociations.map((s) => s.siteId);
-
-    const expectedSiteResourceSet = new Set(newSiteResourceIds);
-    const actualSiteResourceSet = new Set(existingSiteResourceIds);
-    const expectedSiteSet = new Set(newSiteIds);
-    const actualSiteSet = new Set(existingSiteIds);
-
-    const missingSiteResourceIds = newSiteResourceIds.filter(
-        (id) => !actualSiteResourceSet.has(id)
-    );
-    const extraSiteResourceIds = existingSiteResourceIds.filter(
-        (id) => !expectedSiteResourceSet.has(id)
-    );
-    const missingSiteIds = newSiteIds.filter((id) => !actualSiteSet.has(id));
-    const extraSiteIds = existingSiteIds.filter(
-        (id) => !expectedSiteSet.has(id)
-    );
-
-    const consistent =
-        missingSiteResourceIds.length === 0 &&
-        extraSiteResourceIds.length === 0 &&
-        missingSiteIds.length === 0 &&
-        extraSiteIds.length === 0;
-
-    return {
-        clientId: client.clientId,
-        consistent,
-        expectedSiteResourceIds: Array.from(expectedSiteResourceSet).sort(
-            (a, b) => a - b
-        ),
-        expectedSiteIds: Array.from(expectedSiteSet).sort((a, b) => a - b),
-        actualSiteResourceIds: Array.from(actualSiteResourceSet).sort(
-            (a, b) => a - b
-        ),
-        actualSiteIds: Array.from(actualSiteSet).sort((a, b) => a - b),
-        missingSiteResourceIds: missingSiteResourceIds.sort((a, b) => a - b),
-        extraSiteResourceIds: extraSiteResourceIds.sort((a, b) => a - b),
-        missingSiteIds: missingSiteIds.sort((a, b) => a - b),
-        extraSiteIds: extraSiteIds.sort((a, b) => a - b)
-    };
-}
--- a/server/lib/statusHistory.ts
+++ b/server/lib/statusHistory.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { db, logsDb, statusHistory } from "@server/db";
 import { and, eq, gte, asc } from "drizzle-orm";
-import { regionalCache as cache } from "@server/private/lib/cache";
+import cache from "@server/lib/cache";

 const STATUS_HISTORY_CACHE_TTL = 60; // seconds

@@ -66,7 +66,7 @@ export async function invalidateStatusHistoryCache(
    entityId: number
 ): Promise<void> {
    const prefix = `statusHistory:${entityType}:${entityId}:`;
-    const keys = await cache.keysWithPrefix(prefix);
+    const keys = cache.keys().filter((k) => k.startsWith(prefix));
    if (keys.length > 0) {
        await cache.del(keys);
    }
--- a/server/private/lib/cache.ts
+++ b/server/private/lib/cache.ts
@@ -13,7 +13,7 @@

 import NodeCache from "node-cache";
 import logger from "@server/logger";
-import { redisManager, regionalRedisManager } from "@server/private/lib/redis";
+import { redisManager } from "@server/private/lib/redis";

 // Create local cache with maxKeys limit to prevent memory leaks
 // With ~10k requests/day and 5min TTL, 10k keys should be more than sufficient
@@ -298,147 +298,3 @@ class AdaptiveCache {
 // Export singleton instance
 export const cache = new AdaptiveCache();
 export default cache;
-
-/**
- * Regional adaptive cache backed by the in-cluster Redis instance.
- * Falls back to a local NodeCache when the regional Redis is unavailable.
- * Use this for data that is regional in nature (e.g. status history) so
- * reads are served from the same cluster the user is hitting.
- */
-const regionalLocalCache = new NodeCache({
-    stdTTL: 3600,
-    checkperiod: 120,
-    maxKeys: 10000
-});
-
-class RegionalAdaptiveCache {
-    private useRedis(): boolean {
-        return (
-            regionalRedisManager.isRedisEnabled() &&
-            regionalRedisManager.getHealthStatus().isHealthy
-        );
-    }
-
-    async set(key: string, value: any, ttl?: number): Promise<boolean> {
-        const effectiveTtl = ttl === 0 ? undefined : ttl;
-        const redisTtl = ttl === 0 ? undefined : (ttl ?? 3600);
-
-        if (this.useRedis()) {
-            try {
-                const serialized = JSON.stringify(value);
-                const success = await regionalRedisManager.set(
-                    key,
-                    serialized,
-                    redisTtl
-                );
-                if (success) {
-                    logger.debug(`[regional] Set key in Redis: ${key}`);
-                    return true;
-                }
-            } catch (error) {
-                logger.error(
-                    `[regional] Redis set error for key ${key}:`,
-                    error
-                );
-            }
-        }
-
-        const success = regionalLocalCache.set(key, value, effectiveTtl || 0);
-        if (success) logger.debug(`[regional] Set key in local cache: ${key}`);
-        return success;
-    }
-
-    async get<T = any>(key: string): Promise<T | undefined> {
-        if (this.useRedis()) {
-            try {
-                const value = await regionalRedisManager.get(key);
-                if (value !== null) {
-                    logger.debug(`[regional] Cache hit in Redis: ${key}`);
-                    return JSON.parse(value) as T;
-                }
-                logger.debug(`[regional] Cache miss in Redis: ${key}`);
-                return undefined;
-            } catch (error) {
-                logger.error(
-                    `[regional] Redis get error for key ${key}:`,
-                    error
-                );
-            }
-        }
-
-        const value = regionalLocalCache.get<T>(key);
-        if (value !== undefined) {
-            logger.debug(`[regional] Cache hit in local cache: ${key}`);
-        } else {
-            logger.debug(`[regional] Cache miss in local cache: ${key}`);
-        }
-        return value;
-    }
-
-    async del(key: string | string[]): Promise<number> {
-        const keys = Array.isArray(key) ? key : [key];
-        let deletedCount = 0;
-
-        if (this.useRedis()) {
-            try {
-                for (const k of keys) {
-                    const success = await regionalRedisManager.del(k);
-                    if (success) {
-                        deletedCount++;
-                        logger.debug(`[regional] Deleted key from Redis: ${k}`);
-                    }
-                }
-                if (deletedCount === keys.length) return deletedCount;
-                deletedCount = 0;
-            } catch (error) {
-                logger.error(`[regional] Redis del error:`, error);
-                deletedCount = 0;
-            }
-        }
-
-        for (const k of keys) {
-            const count = regionalLocalCache.del(k);
-            if (count > 0) {
-                deletedCount++;
-                logger.debug(`[regional] Deleted key from local cache: ${k}`);
-            }
-        }
-        return deletedCount;
-    }
-
-    async has(key: string): Promise<boolean> {
-        if (this.useRedis()) {
-            try {
-                const value = await regionalRedisManager.get(key);
-                return value !== null;
-            } catch (error) {
-                logger.error(
-                    `[regional] Redis has error for key ${key}:`,
-                    error
-                );
-            }
-        }
-        return regionalLocalCache.has(key);
-    }
-
-    /**
-     * Returns keys matching the given prefix from whichever backend is active.
-     * Redis uses a KEYS scan; local cache filters in-memory keys.
-     */
-    async keysWithPrefix(prefix: string): Promise<string[]> {
-        if (this.useRedis()) {
-            try {
-                return await regionalRedisManager.keys(`${prefix}*`);
-            } catch (error) {
-                logger.error(`[regional] Redis keys error:`, error);
-            }
-        }
-        return regionalLocalCache.keys().filter((k) => k.startsWith(prefix));
-    }
-
-    getCurrentBackend(): "redis" | "local" {
-        return this.useRedis() ? "redis" : "local";
-    }
-}
-
-export const regionalCache = new RegionalAdaptiveCache();
--- a/server/private/lib/logStreaming/index.ts
+++ b/server/private/lib/logStreaming/index.ts
@@ -24,8 +24,7 @@ import { LogStreamingManager } from "./LogStreamingManager";
 */
 export const logStreamingManager = new LogStreamingManager();

-if (build !== "saas") {
-    // this is handled separately in the saas build, so we don't want to start it here
+if (build != "saas") { // this is handled separately in the saas build, so we don't want to start it here
    logStreamingManager.start();
 }

--- a/server/private/lib/readConfigFile.ts
+++ b/server/private/lib/readConfigFile.ts
@@ -73,25 +73,6 @@ export const privateConfigSchema = z
                    .object({
                        rejectUnauthorized: z.boolean().optional().default(true)
                    })
-                    .optional(),
-                regional_redis: z
-                    .object({
-                        host: z.string(),
-                        port: portSchema,
-                        password: z
-                            .string()
-                            .optional()
-                            .transform(getEnvOrYaml("REGIONAL_REDIS_PASSWORD")),
-                        db: z.int().nonnegative().optional().default(0),
-                        tls: z
-                            .object({
-                                rejectUnauthorized: z
-                                    .boolean()
-                                    .optional()
-                                    .default(true)
-                            })
-                            .optional()
-                    })
                    .optional()
            })
            .optional(),
--- a/server/private/lib/redis.ts
+++ b/server/private/lib/redis.ts
@@ -109,14 +109,14 @@ class RedisManager {
            password: redisConfig.password,
            db: redisConfig.db
        };
-
+        
        // Enable TLS if configured (required for AWS ElastiCache in-transit encryption)
        if (redisConfig.tls) {
            opts.tls = {
                rejectUnauthorized: redisConfig.tls.rejectUnauthorized ?? true
            };
        }
-
+        
        return opts;
    }

@@ -135,14 +135,14 @@ class RedisManager {
            password: replica.password,
            db: replica.db || redisConfig.db
        };
-
+        
        // Enable TLS if configured (required for AWS ElastiCache in-transit encryption)
        if (redisConfig.tls) {
            opts.tls = {
                rejectUnauthorized: redisConfig.tls.rejectUnauthorized ?? true
            };
        }
-
+        
        return opts;
    }

@@ -855,163 +855,3 @@ class RedisManager {
 export const redisManager = new RedisManager();
 export const redis = redisManager.getClient();
 export default redisManager;
-
-/**
- * Lightweight Redis manager for the regional (in-cluster) Redis instance.
- * Connects only when `redis.regional_redis` is present in the private config
- * and `flags.enable_redis` is true. No pub/sub — designed for low-latency
- * caching of regionally-scoped data.
- */
-class RegionalRedisManager {
-    private writeClient: Redis | null = null;
-    private readClient: Redis | null = null;
-    private isEnabled: boolean = false;
-    private isHealthy: boolean = false;
-    private connectionTimeout: number = 5000;
-    private commandTimeout: number = 5000;
-
-    constructor() {
-        if (build === "oss") return;
-
-        const cfg = privateConfig.getRawPrivateConfig();
-        if (!cfg.flags.enable_redis || !cfg.redis?.regional_redis) return;
-
-        this.isEnabled = true;
-        this.initializeClients();
-    }
-
-    private getConfig(): RedisOptions {
-        const r = privateConfig.getRawPrivateConfig().redis!.regional_redis!;
-        const opts: RedisOptions = {
-            host: r.host,
-            port: r.port,
-            password: r.password,
-            db: r.db
-        };
-        if (r.tls) {
-            opts.tls = { rejectUnauthorized: r.tls.rejectUnauthorized ?? true };
-        }
-        return opts;
-    }
-
-    private initializeClients(): void {
-        const cfg = this.getConfig();
-        const baseOpts = {
-            ...cfg,
-            enableReadyCheck: false,
-            maxRetriesPerRequest: 3,
-            keepAlive: 10000,
-            connectTimeout: this.connectionTimeout,
-            commandTimeout: this.commandTimeout
-        };
-
-        try {
-            this.writeClient = new Redis(baseOpts);
-            // redis-1 (replica) handles reads; fall back to primary if not resolvable
-            this.readClient = new Redis({
-                ...baseOpts,
-                host: cfg.host!.replace(/^(.*?)(\.\S+)$/, (_, h, rest) => {
-                    // Derive replica hostname from the headless service pattern:
-                    // redis.redis.svc.cluster.local -> redis-1.redis-headless.redis.svc.cluster.local
-                    // If it doesn't look like a k8s service, just use the same host
-                    return h + rest;
-                })
-            });
-
-            // For simplicity use same host for both; callers can always read from primary
-            // The real replica routing is handled by the StatefulSet headless service
-            this.readClient = this.writeClient;
-
-            this.writeClient.on("ready", () => {
-                logger.info("Regional Redis client ready");
-                this.isHealthy = true;
-            });
-            this.writeClient.on("error", (err) => {
-                logger.error("Regional Redis client error:", err);
-                this.isHealthy = false;
-            });
-            this.writeClient.on("reconnecting", () => {
-                logger.info("Regional Redis client reconnecting...");
-                this.isHealthy = false;
-            });
-
-            logger.info("Regional Redis client initialized");
-        } catch (error) {
-            logger.error("Failed to initialize regional Redis client:", error);
-            this.isEnabled = false;
-        }
-    }
-
-    public isRedisEnabled(): boolean {
-        return this.isEnabled && this.writeClient !== null && this.isHealthy;
-    }
-
-    public getHealthStatus() {
-        return { isEnabled: this.isEnabled, isHealthy: this.isHealthy };
-    }
-
-    public async set(
-        key: string,
-        value: string,
-        ttl?: number
-    ): Promise<boolean> {
-        if (!this.isRedisEnabled() || !this.writeClient) return false;
-        try {
-            if (ttl) {
-                await this.writeClient.setex(key, ttl, value);
-            } else {
-                await this.writeClient.set(key, value);
-            }
-            return true;
-        } catch (error) {
-            logger.error("Regional Redis SET error:", error);
-            return false;
-        }
-    }
-
-    public async get(key: string): Promise<string | null> {
-        if (!this.isRedisEnabled() || !this.readClient) return null;
-        try {
-            return await this.readClient.get(key);
-        } catch (error) {
-            logger.error("Regional Redis GET error:", error);
-            return null;
-        }
-    }
-
-    public async del(key: string): Promise<boolean> {
-        if (!this.isRedisEnabled() || !this.writeClient) return false;
-        try {
-            await this.writeClient.del(key);
-            return true;
-        } catch (error) {
-            logger.error("Regional Redis DEL error:", error);
-            return false;
-        }
-    }
-
-    public async keys(pattern: string): Promise<string[]> {
-        if (!this.isRedisEnabled() || !this.readClient) return [];
-        try {
-            return await this.readClient.keys(pattern);
-        } catch (error) {
-            logger.error("Regional Redis KEYS error:", error);
-            return [];
-        }
-    }
-
-    public async disconnect(): Promise<void> {
-        try {
-            if (this.writeClient) {
-                await this.writeClient.quit();
-                this.writeClient = null;
-            }
-            this.readClient = null;
-            logger.info("Regional Redis client disconnected");
-        } catch (error) {
-            logger.error("Error disconnecting regional Redis client:", error);
-        }
-    }
-}
-
-export const regionalRedisManager = new RegionalRedisManager();
--- a/server/private/middlewares/verifySubscription.ts
+++ b/server/private/middlewares/verifySubscription.ts
@@ -25,7 +25,7 @@ export function verifyValidSubscription(tiers: Tier[]) {
        next: NextFunction
    ): Promise<any> {
        try {
-            if (build !== "saas") {
+            if (build != "saas") {
                return next();
            }

--- a/server/private/routers/external.ts
+++ b/server/private/routers/external.ts
@@ -31,8 +31,6 @@ import * as siteProvisioning from "#private/routers/siteProvisioning";
 import * as eventStreamingDestination from "#private/routers/eventStreamingDestination";
 import * as alertRule from "#private/routers/alertRule";
 import * as healthChecks from "#private/routers/healthChecks";
-import * as labels from "#private/routers/labels";
-import * as client from "@server/routers/client";

 import {
    verifyOrgAccess,
@@ -734,59 +732,6 @@ authenticated.get(
    alertRule.getAlertRule
 );

-authenticated.get(
-    "/org/:orgId/labels",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.listOrgLabels),
-    labels.listOrgLabels
-);
-
-authenticated.post(
-    "/org/:orgId/labels",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.createOrgLabel),
-    labels.createOrgLabel
-);
-
-authenticated.patch(
-    "/org/:orgId/label/:labelId",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.updateOrgLabel),
-    labels.updateOrgLabel
-);
-
-authenticated.delete(
-    "/org/:orgId/label/:labelId",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.deleteOrgLabel),
-    labels.deleteOrgLabel
-);
-
-authenticated.put(
-    "/org/:orgId/label/:labelId/attach",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.attachLabelToItem),
-    labels.attachLabelToItem
-);
-
-authenticated.put(
-    "/org/:orgId/label/:labelId/detach",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.detachLabelFromItem),
-    labels.detachLabelFromItem
-);
-
 authenticated.get(
    "/org/:orgId/health-checks",
    verifyValidLicense,
@@ -830,15 +775,3 @@ authenticated.get(
    verifyUserHasAction(ActionsEnum.getTarget),
    healthChecks.getHealthCheckStatusHistory
 );
-
-authenticated.get(
-    "/client/:clientId/verify-associations-cache",
-    verifyClientAccess,
-    client.verifyClientAssociationsCache
-);
-
-authenticated.post(
-    "/client/:clientId/rebuild-associations-cache",
-    verifyClientAccess,
-    client.rebuildClientAssociationsCacheRoute
-);
--- a/server/private/routers/labels/attachLabelToItem.ts
+++ b/server/private/routers/labels/attachLabelToItem.ts
@@ -1,224 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import {
-    clients,
-    clientLabels,
-    db,
-    labels,
-    resourceLabels,
-    resources,
-    siteLabels,
-    siteResourceLabels,
-    siteResources,
-    sites
-} from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import HttpCode from "@server/types/HttpCode";
-import { and, eq, isNull } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty(),
-    labelId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-const attachLabelBodySchema = z.strictObject({
-    siteId: z.number().int().optional(),
-    resourceId: z.number().int().optional(),
-    siteResourceId: z.number().int().optional(),
-    clientId: z.number().int().optional()
-});
-
-export async function attachLabelToItem(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId, labelId } = parsedParams.data;
-
-        const parsedBody = attachLabelBodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { siteId, resourceId, siteResourceId, clientId } =
-            parsedBody.data;
-
-        if (!siteId && !resourceId && !siteResourceId && !clientId) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "At least one of `siteId`, `resourceId`, `siteResourceId` or `clientId` should be provided."
-                )
-            );
-        }
-
-        const [existing] = await db
-            .select()
-            .from(labels)
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)));
-
-        if (!existing) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Label with Id ${labelId} not found`
-                )
-            );
-        }
-
-        if (siteId) {
-            const siteCount = await db.$count(
-                sites,
-                and(eq(sites.siteId, siteId), eq(sites.orgId, orgId))
-            );
-
-            if (siteCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Site with Id ${siteId} doesn't exist.`
-                    )
-                );
-            }
-
-            // idempotent, calling this endpoint multiple times should attach the label only once
-            await db
-                .insert(siteLabels)
-                .values({
-                    labelId,
-                    siteId
-                })
-                .onConflictDoNothing();
-        }
-
-        if (resourceId) {
-            const resourceCount = await db.$count(
-                resources,
-                and(
-                    eq(resources.resourceId, resourceId),
-                    eq(resources.orgId, orgId)
-                )
-            );
-
-            if (resourceCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Resource with Id ${resourceId} doesn't exist.`
-                    )
-                );
-            }
-
-            // idempotent, calling this endpoint multiple times should attach the label only once
-            await db
-                .insert(resourceLabels)
-                .values({
-                    labelId,
-                    resourceId
-                })
-                .onConflictDoNothing();
-        }
-
-        if (siteResourceId) {
-            const resourceCount = await db.$count(
-                siteResources,
-                and(
-                    eq(siteResources.siteResourceId, siteResourceId),
-                    eq(siteResources.orgId, orgId)
-                )
-            );
-
-            if (resourceCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `SiteResource with Id ${siteResourceId} doesn't exist.`
-                    )
-                );
-            }
-
-            // idempotent, calling this endpoint multiple times should attach the label only once
-            await db
-                .insert(siteResourceLabels)
-                .values({
-                    labelId,
-                    siteResourceId
-                })
-                .onConflictDoNothing();
-        }
-
-        if (clientId) {
-            const clientCount = await db.$count(
-                clients,
-                and(
-                    eq(clients.clientId, clientId),
-                    eq(clients.orgId, orgId),
-                    isNull(clients.userId)
-                )
-            );
-
-            if (clientCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Client with Id ${clientId} doesn't exist.`
-                    )
-                );
-            }
-
-            // idempotent, calling this endpoint multiple times should attach the label only once
-            await db
-                .insert(clientLabels)
-                .values({
-                    labelId,
-                    clientId
-                })
-                .onConflictDoNothing();
-        }
-
-        return response(res, {
-            data: {},
-            success: true,
-            error: false,
-            message: "Label attached successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/labels/createOrgLabel.ts
+++ b/server/private/routers/labels/createOrgLabel.ts
@@ -1,149 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-import {
-    db,
-    labels,
-    resourceLabels,
-    resources,
-    siteLabels,
-    sites
-} from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import type { CreateOrEditLabelResponse } from "@server/routers/labels/types";
-import HttpCode from "@server/types/HttpCode";
-import { and, eq } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty()
-});
-
-const bodySchema = z.strictObject({
-    name: z.string().nonempty(),
-    color: z
-        .string()
-        .regex(/^#?([0-9a-f]{6}|[0-9a-f]{3})$/i)
-        .nonempty(),
-    siteId: z.number().int().optional(),
-    resourceId: z.number().int().optional()
-});
-
-export async function createOrgLabel(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId } = parsedParams.data;
-
-        const parsedBody = bodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { name, color, siteId, resourceId } = parsedBody.data;
-
-        if (siteId) {
-            const siteCount = await db.$count(
-                sites,
-                and(eq(sites.siteId, siteId), eq(sites.orgId, orgId))
-            );
-
-            if (siteCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        `Site with Id ${siteId} doesn't exist.`
-                    )
-                );
-            }
-        }
-
-        if (resourceId) {
-            const resourceCount = await db.$count(
-                resources,
-                and(
-                    eq(resources.resourceId, resourceId),
-                    eq(resources.orgId, orgId)
-                )
-            );
-
-            if (resourceCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        `Resource with Id ${resourceId} doesn't exist.`
-                    )
-                );
-            }
-        }
-
-        const label = await db.transaction(async (tx) => {
-            const [label] = await tx
-                .insert(labels)
-                .values({
-                    name,
-                    color,
-                    orgId
-                })
-                .returning();
-
-            if (siteId) {
-                await tx.insert(siteLabels).values({
-                    siteId,
-                    labelId: label.labelId
-                });
-            }
-
-            if (resourceId) {
-                await tx.insert(resourceLabels).values({
-                    resourceId,
-                    labelId: label.labelId
-                });
-            }
-            return label;
-        });
-
-        return response<CreateOrEditLabelResponse>(res, {
-            data: { label },
-            success: true,
-            error: false,
-            message: "Org Label created successfully",
-            status: HttpCode.CREATED
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/labels/deleteOrgLabel.ts
+++ b/server/private/routers/labels/deleteOrgLabel.ts
@@ -1,72 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-import { db, labels } from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import HttpCode from "@server/types/HttpCode";
-import { and, eq } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty(),
-    labelId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-export async function deleteOrgLabel(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId, labelId } = parsedParams.data;
-
-        const [existing] = await db
-            .select()
-            .from(labels)
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)));
-
-        if (!existing) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Label not found"));
-        }
-
-        await db
-            .delete(labels)
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)));
-
-        return response(res, {
-            data: null,
-            success: true,
-            error: false,
-            message: "Label deleted successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/labels/detachLabelFromItem.ts
+++ b/server/private/routers/labels/detachLabelFromItem.ts
@@ -1,224 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import {
-    clients,
-    clientLabels,
-    db,
-    labels,
-    resourceLabels,
-    resources,
-    siteLabels,
-    siteResourceLabels,
-    siteResources,
-    sites
-} from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import HttpCode from "@server/types/HttpCode";
-import { and, eq, isNull } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty(),
-    labelId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-const detachLabelBodySchema = z.strictObject({
-    siteId: z.number().int().optional(),
-    resourceId: z.number().int().optional(),
-    siteResourceId: z.number().int().optional(),
-    clientId: z.number().int().optional()
-});
-
-export async function detachLabelFromItem(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId, labelId } = parsedParams.data;
-
-        const parsedBody = detachLabelBodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { siteId, resourceId, siteResourceId, clientId } =
-            parsedBody.data;
-
-        if (!siteId && !resourceId && !siteResourceId && !clientId) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "At least one of `siteId`, `resourceId`, `siteResourceId` or `clientId` should be provided."
-                )
-            );
-        }
-
-        const [existing] = await db
-            .select()
-            .from(labels)
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)));
-
-        if (!existing) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Label with Id ${labelId} not found`
-                )
-            );
-        }
-
-        if (siteId) {
-            const siteCount = await db.$count(
-                sites,
-                and(eq(sites.siteId, siteId), eq(sites.orgId, orgId))
-            );
-
-            if (siteCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Site with Id ${siteId} doesn't exist.`
-                    )
-                );
-            }
-
-            await db
-                .delete(siteLabels)
-                .where(
-                    and(
-                        eq(siteLabels.labelId, labelId),
-                        eq(siteLabels.siteId, siteId)
-                    )
-                );
-        }
-
-        if (resourceId) {
-            const resourceCount = await db.$count(
-                resources,
-                and(
-                    eq(resources.resourceId, resourceId),
-                    eq(resources.orgId, orgId)
-                )
-            );
-
-            if (resourceCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Resource with Id ${resourceId} doesn't exist.`
-                    )
-                );
-            }
-
-            await db
-                .delete(resourceLabels)
-                .where(
-                    and(
-                        eq(resourceLabels.labelId, labelId),
-                        eq(resourceLabels.resourceId, resourceId)
-                    )
-                );
-        }
-
-        if (siteResourceId) {
-            const resourceCount = await db.$count(
-                siteResources,
-                and(
-                    eq(siteResources.siteResourceId, siteResourceId),
-                    eq(siteResources.orgId, orgId)
-                )
-            );
-
-            if (resourceCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `SiteResource with Id ${siteResourceId} doesn't exist.`
-                    )
-                );
-            }
-
-            await db
-                .delete(siteResourceLabels)
-                .where(
-                    and(
-                        eq(siteResourceLabels.labelId, labelId),
-                        eq(siteResourceLabels.siteResourceId, siteResourceId)
-                    )
-                );
-        }
-
-        if (clientId) {
-            const clientCount = await db.$count(
-                clients,
-                and(
-                    eq(clients.clientId, clientId),
-                    eq(clients.orgId, orgId),
-                    isNull(clients.userId)
-                )
-            );
-
-            if (clientCount === 0) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Client with Id ${clientId} doesn't exist.`
-                    )
-                );
-            }
-
-            await db
-                .delete(clientLabels)
-                .where(
-                    and(
-                        eq(clientLabels.labelId, labelId),
-                        eq(clientLabels.clientId, clientId)
-                    )
-                );
-        }
-
-        return response(res, {
-            data: {},
-            success: true,
-            error: false,
-            message: "Label detached successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/labels/index.ts
+++ b/server/private/routers/labels/index.ts
@@ -1,19 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-export * from "./listOrgLabels";
-export * from "./createOrgLabel";
-export * from "./updateOrgLabel";
-export * from "./attachLabelToItem";
-export * from "./detachLabelFromItem";
-export * from "./deleteOrgLabel";
--- a/server/private/routers/labels/listOrgLabels.ts
+++ b/server/private/routers/labels/listOrgLabels.ts
@@ -1,155 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import { db, labels } from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import type { ListOrgLabelsResponse } from "@server/routers/labels/types";
-import HttpCode from "@server/types/HttpCode";
-import { and, asc, eq, like, sql } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty()
-});
-
-const listLabelsSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
-        .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
-        .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional()
-});
-
-function queryLabelsBase() {
-    return db
-        .select({
-            labelId: labels.labelId,
-            name: labels.name,
-            color: labels.color
-        })
-        .from(labels);
-}
-
-export async function listOrgLabels(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = listLabelsSchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error)
-                )
-            );
-        }
-
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error)
-                )
-            );
-        }
-        const { orgId } = parsedParams.data;
-
-        if (req.user && orgId && orgId !== req.userOrgId) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this organization"
-                )
-            );
-        }
-
-        const { pageSize, page, query } = parsedQuery.data;
-
-        const conditions = [and(eq(labels.orgId, orgId))];
-
-        if (query) {
-            conditions.push(
-                like(
-                    sql`LOWER(${labels.name})`,
-                    "%" + query.toLowerCase() + "%"
-                )
-            );
-        }
-
-        const baseQuery = queryLabelsBase().where(and(...conditions));
-
-        // we need to add `as` so that drizzle filters the result as a subquery
-        const countQuery = db.$count(
-            queryLabelsBase()
-                .where(and(...conditions))
-                .as("filtered_labels")
-        );
-
-        const labelListQuery = baseQuery
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(asc(labels.name));
-
-        const [totalCount, rows] = await Promise.all([
-            countQuery,
-            labelListQuery
-        ]);
-
-        return response<ListOrgLabelsResponse>(res, {
-            data: {
-                labels: rows,
-                pagination: {
-                    total: totalCount,
-                    pageSize,
-                    page
-                }
-            },
-            success: true,
-            error: false,
-            message: "Labels retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/labels/updateOrgLabel.ts
+++ b/server/private/routers/labels/updateOrgLabel.ts
@@ -1,101 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import { db, labels } from "@server/db";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import type { CreateOrEditLabelResponse } from "@server/routers/labels/types";
-import HttpCode from "@server/types/HttpCode";
-import { and, eq } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const paramsSchema = z.strictObject({
-    orgId: z.string().nonempty(),
-    labelId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-const updateLabelBodySchema = z.strictObject({
-    name: z.string().min(1).max(255).optional(),
-    color: z
-        .string()
-        .regex(/^#?([0-9a-f]{6}|[0-9a-f]{3})$/i)
-        .nonempty()
-});
-
-export async function updateOrgLabel(
-    req: Request,
-    res: Response,
-    next: NextFunction
-) {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId, labelId } = parsedParams.data;
-
-        const parsedBody = updateLabelBodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const [existing] = await db
-            .select()
-            .from(labels)
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)));
-
-        if (!existing) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Label not found"));
-        }
-
-        const { name, color } = parsedBody.data;
-
-        const [label] = await db
-            .update(labels)
-            .set({
-                name,
-                color
-            })
-            .where(and(eq(labels.labelId, labelId), eq(labels.orgId, orgId)))
-            .returning();
-
-        return response<CreateOrEditLabelResponse>(res, {
-            data: {
-                label
-            },
-            success: true,
-            error: false,
-            message: "Label updated successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}
--- a/server/private/routers/loginPage/upsertLoginPageBranding.ts
+++ b/server/private/routers/loginPage/upsertLoginPageBranding.ts
@@ -26,6 +26,7 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq, InferInsertModel } from "drizzle-orm";
 import { build } from "@server/build";
+import { validateLocalPath } from "@app/lib/validateLocalPath";
 import config from "#private/lib/config";

 const paramsSchema = z.strictObject({
@@ -34,9 +35,78 @@ const paramsSchema = z.strictObject({

 const bodySchema = z.strictObject({
    logoUrl: z
-        .string()
-        .optional()
-        .transform((val) => (val === "" ? null : val)),
+        .union([
+            z.literal(""),
+            z
+                .string()
+                .superRefine(async (urlOrPath, ctx) => {
+                    const parseResult = z.url().safeParse(urlOrPath);
+                    if (!parseResult.success) {
+                        if (build !== "enterprise") {
+                            ctx.addIssue({
+                                code: "custom",
+                                message: "Must be a valid URL"
+                            });
+                            return;
+                        } else {
+                            try {
+                                validateLocalPath(urlOrPath);
+                            } catch (error) {
+                                ctx.addIssue({
+                                    code: "custom",
+                                    message: "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
+                                });
+                            } finally {
+                                return;
+                            }
+                        }
+                    }
+
+                    try {
+                        const response = await fetch(urlOrPath, {
+                            method: "HEAD"
+                        }).catch(() => {
+                            // If HEAD fails (CORS or method not allowed), try GET
+                            return fetch(urlOrPath, { method: "GET" });
+                        });
+
+                        if (response.status !== 200) {
+                            ctx.addIssue({
+                                code: "custom",
+                                message: `Failed to load image. Please check that the URL is accessible.`
+                            });
+                            return;
+                        }
+
+                        const contentType =
+                            response.headers.get("content-type") ?? "";
+                        if (!contentType.startsWith("image/")) {
+                            ctx.addIssue({
+                                code: "custom",
+                                message: `URL does not point to an image. Please provide a URL to an image file (e.g., .png, .jpg, .svg).`
+                            });
+                            return;
+                        }
+                    } catch (error) {
+                        let errorMessage =
+                            "Unable to verify image URL. Please check that the URL is accessible and points to an image file.";
+
+                        if (error instanceof TypeError && error.message.includes("fetch")) {
+                            errorMessage =
+                                "Network error: Unable to reach the URL. Please check your internet connection and verify the URL is correct.";
+                        } else if (error instanceof Error) {
+                            errorMessage = `Error verifying URL: ${error.message}`;
+                        }
+
+                        ctx.addIssue({
+                            code: "custom",
+                            message: errorMessage
+                        });
+                    }
+                })
+        ])
+        .transform((val) => (val === "" ? null : val))
+        .nullish(),
    logoWidth: z.coerce.number<number>().min(1),
    logoHeight: z.coerce.number<number>().min(1),
    resourceTitle: z.string(),
--- a/server/private/routers/ssh/signSshKey.ts
+++ b/server/private/routers/ssh/signSshKey.ts
@@ -19,7 +19,6 @@ import {
    logsDb,
    newts,
    roles,
-    roleSiteResources,
    roundTripMessageTracker,
    siteResources,
    siteNetworks,
@@ -362,26 +361,9 @@ export async function signSshKey(
        }

        const roleRows = await db
-            .select({
-                sshSudoCommands: roles.sshSudoCommands,
-                sshUnixGroups: roles.sshUnixGroups,
-                sshCreateHomeDir: roles.sshCreateHomeDir,
-                sshSudoMode: roles.sshSudoMode
-            })
+            .select()
            .from(roles)
-            .innerJoin(
-                roleSiteResources,
-                eq(roleSiteResources.roleId, roles.roleId)
-            )
-            .where(
-                and(
-                    inArray(roles.roleId, roleIds),
-                    eq(
-                        roleSiteResources.siteResourceId,
-                        resource.siteResourceId
-                    )
-                )
-            );
+            .where(inArray(roles.roleId, roleIds));

        const parsedSudoCommands: string[] = [];
        const parsedGroupsSet = new Set<string>();
@@ -397,17 +379,13 @@ export async function signSshKey(
            }
            try {
                const grps = JSON.parse(roleRow?.sshUnixGroups ?? "[]");
-                if (Array.isArray(grps))
-                    grps.forEach((g: string) => parsedGroupsSet.add(g));
+                if (Array.isArray(grps)) grps.forEach((g: string) => parsedGroupsSet.add(g));
            } catch {
                // skip
            }
            if (roleRow?.sshCreateHomeDir === true) homedir = true;
            const m = roleRow?.sshSudoMode ?? "none";
-            if (
-                sudoModeOrder[m as keyof typeof sudoModeOrder] >
-                sudoModeOrder[sudoMode]
-            ) {
+            if (sudoModeOrder[m as keyof typeof sudoModeOrder] > sudoModeOrder[sudoMode]) {
                sudoMode = m as "none" | "commands" | "full";
            }
        }
--- a/server/private/routers/ws/ws.ts
+++ b/server/private/routers/ws/ws.ts
@@ -522,13 +522,13 @@ const sendToClientLocal = async (

    const messageString = JSON.stringify(messageWithVersion);
    if (options.compress) {
-        // logger.debug(
-        //     `Message size before compression: ${messageString.length} bytes`
-        // );
+        logger.debug(
+            `Message size before compression: ${messageString.length} bytes`
+        );
        const compressed = zlib.gzipSync(Buffer.from(messageString, "utf8"));
-        // logger.debug(
-        //     `Message size after compression: ${compressed.length} bytes`
-        // );
+        logger.debug(
+            `Message size after compression: ${compressed.length} bytes`
+        );
        clients.forEach((client) => {
            if (client.readyState === WebSocket.OPEN) {
                client.send(compressed);
--- a/server/routers/client/index.ts
+++ b/server/routers/client/index.ts
@@ -10,5 +10,3 @@ export * from "./listUserDevices";
 export * from "./updateClient";
 export * from "./getClient";
 export * from "./createUserClient";
-export * from "./verifyClientAssociationsCache";
-export * from "./rebuildClientAssociationsCacheRoute";
--- a/server/routers/client/listClients.ts
+++ b/server/routers/client/listClients.ts
@@ -1,20 +1,15 @@
 import {
-    clientLabels,
    clients,
    clientSitesAssociationsCache,
    currentFingerprint,
    db,
-    labels,
    olms,
    orgs,
    roleClients,
    sites,
    userClients,
-    users,
-    type Label
+    users
 } from "@server/db";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import response from "@server/lib/response";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
@@ -174,7 +169,6 @@ type ClientWithSites = Awaited<ReturnType<typeof queryClientsBase>>[0] & {
        siteNiceId: string | null;
    }>;
    olmUpdateAvailable?: boolean;
-    labels?: Array<Pick<Label, "labelId" | "name" | "color">>;
 };

 type OlmWithUpdateAvailable = ClientWithSites;
@@ -261,11 +255,6 @@ export async function listClients(
            (client) => client.clientId
        );

-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
        // Get client count with filter
        const conditions = [
            and(
@@ -299,29 +288,18 @@ export async function listClients(
        }

        if (query) {
-            const q = "%" + query.toLowerCase() + "%";
-            const queryList = [
-                like(sql`LOWER(${clients.name})`, q),
-                like(sql`LOWER(${clients.niceId})`, q)
-            ];
-
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        clients.clientId,
-                        db
-                            .select({ id: clientLabels.clientId })
-                            .from(clientLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, clientLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
+            conditions.push(
+                or(
+                    like(
+                        sql`LOWER(${clients.name})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${clients.niceId})`,
+                        "%" + query.toLowerCase() + "%"
                    )
-                );
-            }
-
-            conditions.push(or(...queryList));
+                )
+            );
        }

        const baseQuery = queryClientsBase().where(and(...conditions));
@@ -348,30 +326,6 @@ export async function listClients(
        const clientIds = clientsList.map((client) => client.clientId);
        const siteAssociations = await getSiteAssociations(clientIds);

-        let labelsForClients: Array<{
-            labelId: number;
-            name: string;
-            color: string;
-            clientId: number;
-        }> = [];
-
-        if (isLabelFeatureEnabled && clientIds.length > 0) {
-            labelsForClients = await db
-                .select({
-                    labelId: labels.labelId,
-                    name: labels.name,
-                    color: labels.color,
-                    clientId: clientLabels.clientId
-                })
-                .from(labels)
-                .innerJoin(
-                    clientLabels,
-                    eq(clientLabels.labelId, labels.labelId)
-                )
-                .where(inArray(clientLabels.clientId, clientIds))
-                .orderBy(asc(clientLabels.clientLabelId));
-        }
-
        // Group site associations by client ID
        const sitesByClient = siteAssociations.reduce(
            (acc, association) => {
@@ -399,10 +353,7 @@ export async function listClients(
        const clientsWithSites = clientsList.map((client) => {
            return {
                ...client,
-                sites: sitesByClient[client.clientId] || [],
-                labels: labelsForClients.filter(
-                    (l) => l.clientId === client.clientId
-                )
+                sites: sitesByClient[client.clientId] || []
            };
        });

--- a/server/routers/client/rebuildClientAssociationsCacheRoute.ts
+++ b/server/routers/client/rebuildClientAssociationsCacheRoute.ts
@@ -1,81 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db } from "@server/db";
-import { clients } from "@server/db";
-import { eq } from "drizzle-orm";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { OpenAPITags, registry } from "@server/openApi";
-import { rebuildClientAssociationsFromClient } from "@server/lib/rebuildClientAssociations";
-
-const paramsSchema = z.strictObject({
-    clientId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-registry.registerPath({
-    method: "post",
-    path: "/client/{clientId}/rebuild-associations-cache",
-    description:
-        "Rebuild the client's site/site-resource association cache based on current permissions.",
-    tags: [OpenAPITags.Client],
-    request: {
-        params: paramsSchema
-    },
-    responses: {}
-});
-
-export async function rebuildClientAssociationsCacheRoute(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { clientId } = parsedParams.data;
-
-        const [client] = await db
-            .select()
-            .from(clients)
-            .where(eq(clients.clientId, clientId))
-            .limit(1);
-
-        if (!client) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Client with ID ${clientId} not found`
-                )
-            );
-        }
-
-        await rebuildClientAssociationsFromClient(client);
-
-        return response(res, {
-            data: null,
-            success: true,
-            error: false,
-            message: "Client association cache rebuilt successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "Failed to rebuild client association cache"
-            )
-        );
-    }
-}
--- a/server/routers/client/verifyClientAssociationsCache.ts
+++ b/server/routers/client/verifyClientAssociationsCache.ts
@@ -1,83 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db } from "@server/db";
-import { clients } from "@server/db";
-import { eq } from "drizzle-orm";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { OpenAPITags, registry } from "@server/openApi";
-import { verifyClientAssociationsCache as verifyClientAssociationsCacheLib } from "@server/lib/rebuildClientAssociations";
-
-const paramsSchema = z.strictObject({
-    clientId: z.string().transform(Number).pipe(z.int().positive())
-});
-
-registry.registerPath({
-    method: "get",
-    path: "/client/{clientId}/verify-associations-cache",
-    description:
-        "Read-only check of whether the client's site/site-resource association cache matches what the current permissions imply.",
-    tags: [OpenAPITags.Client],
-    request: {
-        params: paramsSchema
-    },
-    responses: {}
-});
-
-export async function verifyClientAssociationsCache(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { clientId } = parsedParams.data;
-
-        const [client] = await db
-            .select()
-            .from(clients)
-            .where(eq(clients.clientId, clientId))
-            .limit(1);
-
-        if (!client) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Client with ID ${clientId} not found`
-                )
-            );
-        }
-
-        const report = await verifyClientAssociationsCacheLib(client);
-
-        return response(res, {
-            data: report,
-            success: true,
-            error: false,
-            message: report.consistent
-                ? "Client association cache is consistent"
-                : "Client association cache is INCONSISTENT",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "Failed to verify client association cache"
-            )
-        );
-    }
-}
--- a/server/routers/external.ts
+++ b/server/routers/external.ts
@@ -1231,22 +1231,6 @@ authRouter.post(
    newt.getNewtToken
 );

-authRouter.post(
-    "/newt/version",
-    rateLimit({
-        windowMs: 15 * 60 * 1000,
-        max: 60,
-        keyGenerator: (req) =>
-            `newtVersion:${req.body.newtId || ipKeyGenerator(req.ip || "")}`,
-        handler: (req, res, next) => {
-            const message = `You can only check the Newt version ${60} times every ${15} minutes. Please try again later.`;
-            return next(createHttpError(HttpCode.TOO_MANY_REQUESTS, message));
-        },
-        store: createStore()
-    }),
-    newt.getNewtVersion
-);
-
 authRouter.post(
    "/newt/register",
    rateLimit({
--- a/server/routers/labels/types.ts
+++ b/server/routers/labels/types.ts
@@ -1,10 +0,0 @@
-import type { Label } from "@server/db";
-import type { PaginatedResponse } from "@server/types/Pagination";
-
-export type ListOrgLabelsResponse = PaginatedResponse<{
-    labels: Omit<Label, "orgId">[];
-}>;
-
-export type CreateOrEditLabelResponse = {
-    label: Label;
-};
--- a/server/routers/newt/getNewtVersion.ts
+++ b/server/routers/newt/getNewtVersion.ts
@@ -1,317 +0,0 @@
-import { db, orgs, sites } from "@server/db";
-import { newts } from "@server/db";
-import { eq } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-import semver from "semver";
-import { verifyPassword } from "@server/auth/password";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import logger from "@server/logger";
-import cache from "#dynamic/lib/cache";
-import config from "@server/lib/config";
-
-// Stale-while-revalidate in-memory fallback for the releases API.
-type ReleaseInfo = {
-    version: string;
-    // binary filename -> sha256 hex (sourced from asset `digest` field in GitHub API)
-    assetDigests: Record<string, string>;
-};
-let staleReleaseInfo: ReleaseInfo | null = null;
-
-/**
- * Fetches the latest stable newt release from GitHub and returns the version
- * tag together with a map of asset-name → sha256 hex digest.
- * Results are cached for one hour; stale data is returned on failure.
- */
-async function getLatestReleaseInfo(): Promise<ReleaseInfo | null> {
-    try {
-        const cached = await cache.get<ReleaseInfo>("cache:newtReleaseInfo");
-        if (cached) {
-            return cached;
-        }
-
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 5000);
-
-        const fetchResponse = await fetch(
-            "https://api.github.com/repos/fosrl/newt/releases",
-            { signal: controller.signal }
-        );
-
-        clearTimeout(timeoutId);
-
-        if (!fetchResponse.ok) {
-            logger.warn(
-                `Failed to fetch Newt releases from GitHub: ${fetchResponse.status} ${fetchResponse.statusText}`
-            );
-            return staleReleaseInfo;
-        }
-
-        let releases: any[] = await fetchResponse.json();
-        if (!Array.isArray(releases) || releases.length === 0) {
-            logger.warn("No releases found for Newt repository");
-            return staleReleaseInfo;
-        }
-
-        // Drop drafts, pre-releases, and anything with "rc" in the tag name.
-        releases = releases.filter(
-            (r: any) =>
-                !r.draft &&
-                !r.prerelease &&
-                !r.tag_name.includes("rc") &&
-                !r.tag_name.includes("v")
-        );
-
-        // Sort descending by semver to find the true latest stable release.
-        releases.sort((a: any, b: any) => {
-            const va = semver.coerce(a.tag_name);
-            const vb = semver.coerce(b.tag_name);
-            if (!va && !vb) return 0;
-            if (!va) return 1;
-            if (!vb) return -1;
-            return semver.rcompare(va, vb);
-        });
-
-        if (releases.length === 0) {
-            logger.warn("No stable releases found for Newt repository");
-            return staleReleaseInfo;
-        }
-
-        const latest = releases[0];
-        const version: string = latest.tag_name;
-
-        // Build a map of binary filename → sha256 hex from the asset `digest`
-        // field returned by the GitHub API (format: "sha256:<hex>").
-        const assetDigests: Record<string, string> = {};
-        if (Array.isArray(latest.assets)) {
-            for (const asset of latest.assets) {
-                if (
-                    typeof asset.name === "string" &&
-                    typeof asset.digest === "string" &&
-                    asset.digest.startsWith("sha256:")
-                ) {
-                    assetDigests[asset.name] = asset.digest.slice(
-                        "sha256:".length
-                    );
-                }
-            }
-        }
-
-        const info: ReleaseInfo = { version, assetDigests };
-        staleReleaseInfo = info;
-        await cache.set("cache:newtReleaseInfo", info, 3600);
-        return info;
-    } catch (error: any) {
-        if (error.name === "AbortError") {
-            logger.warn("Request to fetch Newt releases timed out (5s)");
-        } else {
-            logger.warn(
-                "Error fetching Newt releases:",
-                error.message || error
-            );
-        }
-        return staleReleaseInfo;
-    }
-}
-
-const bodySchema = z.object({
-    newtId: z.string(),
-    secret: z.string(),
-    platform: z.string() // e.g. "linux_amd64", "darwin_arm64"
-});
-
-export type GetNewtVersionBody = z.infer<typeof bodySchema>;
-
-export type GetNewtVersionResponse = {
-    latestVersion: string;
-    currentIsLatest: boolean;
-    downloadUrl: string;
-    sha256: string;
-};
-
-export async function getNewtVersion(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    const parsedBody = bodySchema.safeParse(req.body);
-
-    if (!parsedBody.success) {
-        return next(
-            createHttpError(
-                HttpCode.BAD_REQUEST,
-                fromError(parsedBody.error).toString()
-            )
-        );
-    }
-
-    const { newtId, secret, platform } = parsedBody.data;
-
-    try {
-        // Verify newt credentials
-        const [existingNewt] = await db
-            .select()
-            .from(newts)
-            .where(eq(newts.newtId, newtId))
-            .limit(1);
-
-        if (!existingNewt) {
-            if (config.getRawConfig().app.log_failed_attempts) {
-                logger.info(
-                    `Newt version check: no newt found with ID ${newtId}. IP: ${req.ip}.`
-                );
-            }
-            return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "Invalid credentials")
-            );
-        }
-
-        if (!existingNewt.siteId) {
-            logger.warn(`Newt ${newtId} has no associated site`);
-            return next(
-                createHttpError(
-                    HttpCode.UNAUTHORIZED,
-                    "Not associated with a site"
-                )
-            );
-        }
-
-        const validSecret = await verifyPassword(
-            secret,
-            existingNewt.secretHash
-        );
-        if (!validSecret) {
-            if (config.getRawConfig().app.log_failed_attempts) {
-                logger.info(
-                    `Newt version check: invalid secret for newt ID ${newtId}. IP: ${req.ip}.`
-                );
-            }
-            return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "Invalid credentials")
-            );
-        }
-
-        // check if udpates are enabled for the org or the site
-        const [site] = await db
-            .select()
-            .from(sites)
-            .where(eq(sites.siteId, existingNewt.siteId))
-            .limit(1);
-
-        if (!site) {
-            logger.warn(`Site with ID ${existingNewt.siteId} not found`);
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Associated site not found"
-                )
-            );
-        }
-
-        const [org] = await db
-            .select()
-            .from(orgs)
-            .where(eq(orgs.orgId, site.orgId))
-            .limit(1);
-
-        if (!org) {
-            logger.warn(`Org with ID ${site.orgId} not found`);
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Associated organization not found"
-                )
-            );
-        }
-
-        let doUpdate = false;
-
-        if (site.autoUpdateOverrideOrg) {
-            doUpdate = site.autoUpdateEnabled;
-        } else {
-            doUpdate = org.settingsEnableGlobalNewtAutoUpdate;
-        }
-
-        if (!doUpdate) {
-            // return no content http code
-            return response(res, {
-                data: {
-                    latestVersion: existingNewt.version ?? "",
-                    currentIsLatest: true,
-                    downloadUrl: "",
-                    sha256: ""
-                },
-                success: true,
-                error: false,
-                message:
-                    "Auto-updates are disabled for this site and organization",
-                status: HttpCode.NO_CONTENT
-            });
-        }
-
-        // Fetch latest release info (version + asset digests) in one API call.
-        const releaseInfo = await getLatestReleaseInfo();
-
-        if (!releaseInfo) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Unable to determine latest Newt version"
-                )
-            );
-        }
-
-        const latestVersion = releaseInfo.version;
-
-        // Binary name follows the get-newt.sh convention: newt_<platform>[.exe]
-        const binaryName = platform.includes("windows")
-            ? `newt_${platform}.exe`
-            : `newt_${platform}`;
-
-        const downloadUrl = `https://github.com/fosrl/newt/releases/download/${latestVersion}/${binaryName}`;
-
-        // Look up the SHA256 digest for this specific binary from the GitHub
-        // release asset metadata (the `digest` field, format "sha256:<hex>").
-        const sha256 = releaseInfo.assetDigests[binaryName] ?? "";
-
-        // Determine whether the newt that's asking is already up to date.
-        // We store the current version on the newt row when it registers.
-        const currentVersion = existingNewt.version ?? null;
-        let currentIsLatest = false;
-        if (currentVersion) {
-            try {
-                const latest = semver.coerce(latestVersion);
-                const current = semver.coerce(currentVersion);
-                if (latest && current) {
-                    currentIsLatest = !semver.lt(current, latest);
-                }
-            } catch {
-                // If we can't compare, assume not latest
-            }
-        }
-
-        return response<GetNewtVersionResponse>(res, {
-            data: {
-                latestVersion,
-                currentIsLatest,
-                downloadUrl,
-                sha256
-            },
-            success: true,
-            error: false,
-            message: "Version info retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (e) {
-        logger.error(e);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "Failed to retrieve version info"
-            )
-        );
-    }
-}
--- a/server/routers/newt/index.ts
+++ b/server/routers/newt/index.ts
@@ -1,6 +1,5 @@
 export * from "./createNewt";
 export * from "./getNewtToken";
-export * from "./getNewtVersion";
 export * from "./handleNewtRegisterMessage";
 export * from "./handleReceiveBandwidthMessage";
 export * from "./handleNewtGetConfigMessage";
--- a/server/routers/org/updateOrg.ts
+++ b/server/routers/org/updateOrg.ts
@@ -40,8 +40,7 @@ const updateOrgBodySchema = z
        settingsLogRetentionDaysConnection: z
            .number()
            .min(build === "saas" ? 0 : -1)
-            .optional(),
-        settingsEnableGlobalNewtAutoUpdate: z.boolean().optional()
+            .optional()
    })
    .refine((data) => Object.keys(data).length > 0, {
        error: "At least one field must be provided for update"
@@ -119,15 +118,6 @@ export async function updateOrg(
        if (!hasPasswordExpirationFeature) {
            parsedBody.data.passwordExpiryDays = undefined;
        }
-
-        const hasNewtAutoUpdateFeature = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix[TierFeature.NewtAutoUpdate]
-        );
-        if (!hasNewtAutoUpdateFeature) {
-            parsedBody.data.settingsEnableGlobalNewtAutoUpdate = false; // force it off
-        }
-
        if (build == "saas") {
            const { tier } = await getOrgTierData(orgId);

@@ -146,10 +136,8 @@ export async function updateOrg(

            if (maxRetentionDays !== null) {
                if (
-                    parsedBody.data.settingsLogRetentionDaysRequest !==
-                        undefined &&
-                    parsedBody.data.settingsLogRetentionDaysRequest >
-                        maxRetentionDays
+                    parsedBody.data.settingsLogRetentionDaysRequest !== undefined &&
+                    parsedBody.data.settingsLogRetentionDaysRequest > maxRetentionDays
                ) {
                    return next(
                        createHttpError(
@@ -159,10 +147,8 @@ export async function updateOrg(
                    );
                }
                if (
-                    parsedBody.data.settingsLogRetentionDaysAccess !==
-                        undefined &&
-                    parsedBody.data.settingsLogRetentionDaysAccess >
-                        maxRetentionDays
+                    parsedBody.data.settingsLogRetentionDaysAccess !== undefined &&
+                    parsedBody.data.settingsLogRetentionDaysAccess > maxRetentionDays
                ) {
                    return next(
                        createHttpError(
@@ -172,10 +158,8 @@ export async function updateOrg(
                    );
                }
                if (
-                    parsedBody.data.settingsLogRetentionDaysAction !==
-                        undefined &&
-                    parsedBody.data.settingsLogRetentionDaysAction >
-                        maxRetentionDays
+                    parsedBody.data.settingsLogRetentionDaysAction !== undefined &&
+                    parsedBody.data.settingsLogRetentionDaysAction > maxRetentionDays
                ) {
                    return next(
                        createHttpError(
@@ -185,10 +169,8 @@ export async function updateOrg(
                    );
                }
                if (
-                    parsedBody.data.settingsLogRetentionDaysConnection !==
-                        undefined &&
-                    parsedBody.data.settingsLogRetentionDaysConnection >
-                        maxRetentionDays
+                    parsedBody.data.settingsLogRetentionDaysConnection !== undefined &&
+                    parsedBody.data.settingsLogRetentionDaysConnection > maxRetentionDays
                ) {
                    return next(
                        createHttpError(
@@ -214,9 +196,7 @@ export async function updateOrg(
                settingsLogRetentionDaysAction:
                    parsedBody.data.settingsLogRetentionDaysAction,
                settingsLogRetentionDaysConnection:
-                    parsedBody.data.settingsLogRetentionDaysConnection,
-                settingsEnableGlobalNewtAutoUpdate:
-                    parsedBody.data.settingsEnableGlobalNewtAutoUpdate
+                    parsedBody.data.settingsLogRetentionDaysConnection
            })
            .where(eq(orgs.orgId, orgId))
            .returning();
--- a/server/routers/resource/listResources.ts
+++ b/server/routers/resource/listResources.ts
@@ -1,9 +1,7 @@
 import {
    db,
-    labels,
    resourceHeaderAuth,
    resourceHeaderAuthExtendedCompatibility,
-    resourceLabels,
    resourcePassword,
    resourcePincode,
    resources,
@@ -11,11 +9,8 @@ import {
    sites,
    targetHealthCheck,
    targets,
-    userResources,
-    type Label
+    userResources
 } from "@server/db";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import response from "@server/lib/response";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
@@ -159,7 +154,6 @@ export type ResourceWithTargets = {
        siteNiceId: string;
        online?: boolean; // undefined for local sites
    }>;
-    labels?: Array<Pick<Label, "color" | "labelId" | "name">>;
 };

 function queryResourcesBase() {
@@ -294,11 +288,6 @@ export async function listResources(
            );
        }

-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
        let accessibleResources: Array<{ resourceId: number }>;
        if (req.user) {
            accessibleResources = await db
@@ -336,6 +325,24 @@ export async function listResources(
            )
        ];

+        if (query) {
+            conditions.push(
+                or(
+                    like(
+                        sql`LOWER(${resources.name})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${resources.niceId})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${resources.fullDomain})`,
+                        "%" + query.toLowerCase() + "%"
+                    )
+                )
+            );
+        }
        if (typeof enabled !== "undefined") {
            conditions.push(eq(resources.enabled, enabled));
        }
@@ -379,32 +386,6 @@ export async function listResources(
                .where(and(eq(sites.orgId, orgId), eq(sites.siteId, siteId)));
            conditions.push(inArray(resources.resourceId, resourcesWithSite));
        }
-        if (query) {
-            const q = "%" + query.toLowerCase() + "%";
-            const queryList = [
-                like(sql`LOWER(${resources.name})`, q),
-                like(sql`LOWER(${resources.niceId})`, q),
-                like(sql`LOWER(${resources.fullDomain})`, q)
-            ];
-
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        resources.resourceId,
-                        db
-                            .select({ id: resourceLabels.resourceId })
-                            .from(resourceLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, resourceLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-
-            conditions.push(or(...queryList));
-        }

        const baseQuery = queryResourcesBase().where(and(...conditions));

@@ -426,36 +407,6 @@ export async function listResources(
        ]);

        const resourceIdList = rows.map((row) => row.resourceId);
-
-        let labelsForResources: Array<{
-            labelId: number;
-            name: string;
-            color: string;
-            resourceId: number;
-        }> = [];
-
-        if (isLabelFeatureEnabled) {
-            labelsForResources =
-                resourceIdList.length === 0
-                    ? []
-                    : await db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              resourceId: resourceLabels.resourceId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              resourceLabels,
-                              eq(resourceLabels.labelId, labels.labelId)
-                          )
-                          .where(
-                              inArray(resourceLabels.resourceId, resourceIdList)
-                          )
-                          .orderBy(asc(resourceLabels.resourceLabelId));
-        }
-
        const allResourceTargets =
            resourceIdList.length === 0
                ? []
@@ -507,10 +458,7 @@ export async function listResources(
                    headerAuthId: row.headerAuthId,
                    health: row.health ?? null,
                    targets: [],
-                    sites: [],
-                    labels: labelsForResources.filter(
-                        (l) => l.resourceId === row.resourceId
-                    )
+                    sites: []
                };
                map.set(row.resourceId, entry);
            }
--- a/server/routers/site/listSites.ts
+++ b/server/routers/site/listSites.ts
@@ -9,10 +9,7 @@ import {
    siteResources,
    targets,
    sites,
-    userSites,
-    labels,
-    siteLabels,
-    type Label
+    userSites
 } from "@server/db";
 import cache from "#dynamic/lib/cache";
 import response from "@server/lib/response";
@@ -26,8 +23,6 @@ import createHttpError from "http-errors";
 import semver from "semver";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";

 // Stale-while-revalidate: keeps the last successfully fetched version so that
 // a transient network failure / timeout does not flip every site back to
@@ -192,7 +187,7 @@ const listSitesSchema = z.object({

 function querySitesBase() {
    return db
-        .selectDistinct({
+        .select({
            siteId: sites.siteId,
            niceId: sites.niceId,
            name: sites.name,
@@ -238,7 +233,6 @@ type SiteRowBase = Awaited<ReturnType<typeof querySitesBase>>[0];
 type SiteWithUpdateAvailable = Omit<SiteRowBase, "online"> & {
    online?: SiteRowBase["online"]; // undefined for local sites
    newtUpdateAvailable?: boolean;
-    labels?: Array<Pick<Label, "color" | "labelId" | "name">>;
 };

 export type ListSitesResponse = PaginatedResponse<{
@@ -314,11 +308,6 @@ export async function listSites(
                .where(eq(sites.orgId, orgId));
        }

-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
        const { pageSize, page, query, sort_by, order, online, status } =
            parsedQuery.data;

@@ -330,43 +319,33 @@ export async function listSites(
                eq(sites.orgId, orgId)
            )
        ];
-
+        if (query) {
+            conditions.push(
+                or(
+                    like(
+                        sql`LOWER(${sites.name})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${sites.niceId})`,
+                        "%" + query.toLowerCase() + "%"
+                    )
+                )
+            );
+        }
        if (typeof online !== "undefined") {
            conditions.push(eq(sites.online, online));
        }
        if (typeof status !== "undefined") {
            conditions.push(eq(sites.status, status));
        }
-        if (query) {
-            const q = "%" + query.toLowerCase() + "%";
-            const queryList = [
-                like(sql`LOWER(${sites.name})`, q),
-                like(sql`LOWER(${sites.niceId})`, q)
-            ];
-
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        sites.siteId,
-                        db
-                            .select({ id: siteLabels.siteId })
-                            .from(siteLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, siteLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-            conditions.push(or(...queryList));
-        }
-
        const baseQuery = querySitesBase().where(and(...conditions));

        // we need to add `as` so that drizzle filters the result as a subquery
        const countQuery = db.$count(
-            querySitesBase().where(and(...conditions)).as("filtered_sites")
+            querySitesBase()
+                .where(and(...conditions))
+                .as("filtered_sites")
        );

        const siteListQuery = baseQuery
@@ -388,46 +367,11 @@ export async function listSites(
        // Get latest version asynchronously without blocking the response
        const latestNewtVersionPromise = getLatestNewtVersion();

-        const siteIds = rows.map((site) => site.siteId);
-
-        let labelsForSites: Array<{
-            labelId: number;
-            name: string;
-            color: string;
-            siteId: number;
-        }> = [];
-
-        if (isLabelFeatureEnabled) {
-            labelsForSites =
-                siteIds.length === 0
-                    ? []
-                    : await db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              siteId: siteLabels.siteId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              siteLabels,
-                              eq(siteLabels.labelId, labels.labelId)
-                          )
-                          .where(inArray(siteLabels.siteId, siteIds))
-                          .orderBy(asc(siteLabels.siteLabelId));
-        }
-
        const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {
            const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
            // Initially set to false, will be updated if version check succeeds
            siteWithUpdate.newtUpdateAvailable = false;
-
-            // associate labels
-            const labelsForSite = labelsForSites.filter(
-                (label) => label.siteId === site.siteId
-            );
-
-            return { ...siteWithUpdate, labels: labelsForSite };
+            return siteWithUpdate;
        });

        // Try to get the latest version, but don't block if it fails
--- a/server/routers/site/updateSite.ts
+++ b/server/routers/site/updateSite.ts
@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, Site } from "@server/db";
+import { db } from "@server/db";
 import { sites } from "@server/db";
 import { eq, and, ne } from "drizzle-orm";
 import response from "@server/lib/response";
@@ -9,8 +9,7 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
+import { isValidCIDR } from "@server/lib/validators";

 const updateSiteParamsSchema = z.strictObject({
    siteId: z.string().transform(Number).pipe(z.int().positive())
@@ -22,8 +21,18 @@ const updateSiteBodySchema = z
        niceId: z.string().min(1).max(255).optional(),
        dockerSocketEnabled: z.boolean().optional(),
        status: z.enum(["pending", "approved"]).optional(),
-        autoUpdateEnabled: z.boolean().optional(),
-        autoUpdateOverrideOrg: z.boolean().optional()
+        // remoteSubnets: z.string().optional()
+        // subdomain: z
+        //     .string()
+        //     .min(1)
+        //     .max(255)
+        //     .transform((val) => val.toLowerCase())
+        //     .optional()
+        // pubKey: z.string().optional(),
+        // subnet: z.string().optional(),
+        // exitNode: z.number().int().positive().optional(),
+        // megabytesIn: z.number().int().nonnegative().optional(),
+        // megabytesOut: z.number().int().nonnegative().optional(),
    })
    .refine((data) => Object.keys(data).length > 0, {
        error: "At least one field must be provided for update"
@@ -76,24 +85,9 @@ export async function updateSite(
        const { siteId } = parsedParams.data;
        const updateData = parsedBody.data;

-        const [existingSite] = await db
-            .select()
-            .from(sites)
-            .where(eq(sites.siteId, siteId))
-            .limit(1);
-
-        if (!existingSite) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    `Site with ID ${siteId} not found`
-                )
-            );
-        }
-
        // if niceId is provided, check if it's already in use by another site
        if (updateData.niceId) {
-            const [existingSiteNiceIdOverlap] = await db
+            const [existingSite] = await db
                .select()
                .from(sites)
                .where(
@@ -105,7 +99,7 @@ export async function updateSite(
                )
                .limit(1);

-            if (existingSiteNiceIdOverlap) {
+            if (existingSite) {
                return next(
                    createHttpError(
                        HttpCode.CONFLICT,
@@ -115,15 +109,6 @@ export async function updateSite(
            }
        }

-        const hasNewtAutoUpdateFeature = await isLicensedOrSubscribed(
-            existingSite.orgId,
-            tierMatrix[TierFeature.NewtAutoUpdate]
-        );
-        if (!hasNewtAutoUpdateFeature) {
-            parsedBody.data.autoUpdateEnabled = false; // force it off
-            parsedBody.data.autoUpdateOverrideOrg = false; // force it off
-        }
-
        // // if remoteSubnets is provided, ensure it's a valid comma-separated list of cidrs
        // if (updateData.remoteSubnets) {
        //     const subnets = updateData.remoteSubnets
--- a/server/routers/siteResource/listAllSiteResourcesByOrg.ts
+++ b/server/routers/siteResource/listAllSiteResourcesByOrg.ts
@@ -1,14 +1,4 @@
-import {
-    db,
-    DB_TYPE,
-    Label,
-    SiteResource,
-    siteNetworks,
-    siteResourceLabels,
-    siteResources,
-    sites,
-    labels
-} from "@server/db";
+import { db, DB_TYPE, SiteResource, siteNetworks, siteResources, sites } from "@server/db";
 import response from "@server/lib/response";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
@@ -19,8 +9,6 @@ import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
-import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";

 const listAllSiteResourcesByOrgParamsSchema = z.strictObject({
    orgId: z.string()
@@ -81,11 +69,16 @@ const listAllSiteResourcesByOrgQuerySchema = z.object({
            default: "asc",
            description: "Sort order"
        }),
-    siteId: z.coerce.number<string>().int().positive().optional().openapi({
-        type: "integer",
-        description:
-            "When set, only site resources associated with this site (via network) are returned"
-    })
+    siteId: z.coerce
+        .number<string>()
+        .int()
+        .positive()
+        .optional()
+        .openapi({
+            type: "integer",
+            description:
+                "When set, only site resources associated with this site (via network) are returned"
+        })
 });

 export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
@@ -95,7 +88,6 @@ export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
        siteNames: string[];
        siteNiceIds: string[];
        siteAddresses: (string | null)[];
-        labels?: Array<Pick<Label, "labelId" | "name" | "color">>;
    })[];
 }>;

@@ -242,11 +234,6 @@ export async function listAllSiteResourcesByOrg(
        const { page, pageSize, query, mode, sort_by, order, siteId } =
            parsedQuery.data;

-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
        const conditions = [and(eq(siteResources.orgId, orgId))];

        if (siteId != null) {
@@ -271,41 +258,41 @@ export async function listAllSiteResourcesByOrg(
                inArray(siteResources.siteResourceId, resourcesForSite)
            );
        }
+        if (query) {
+            conditions.push(
+                or(
+                    like(
+                        sql`LOWER(${siteResources.name})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${siteResources.niceId})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${siteResources.destination})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${siteResources.alias})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${siteResources.aliasAddress})`,
+                        "%" + query.toLowerCase() + "%"
+                    ),
+                    like(
+                        sql`LOWER(${sites.name})`,
+                        "%" + query.toLowerCase() + "%"
+                    )
+                )
+            );
+        }

        if (mode) {
            conditions.push(eq(siteResources.mode, mode));
        }

-        if (query) {
-            const q = "%" + query.toLowerCase() + "%";
-            const queryList = [
-                like(sql`LOWER(${siteResources.name})`, q),
-                like(sql`LOWER(${siteResources.niceId})`, q),
-                like(sql`LOWER(${siteResources.destination})`, q),
-                like(sql`LOWER(${siteResources.alias})`, q),
-                like(sql`LOWER(${siteResources.aliasAddress})`, q),
-                like(sql`LOWER(${sites.name})`, q)
-            ];
-
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        siteResources.siteResourceId,
-                        db
-                            .select({ id: siteResourceLabels.siteResourceId })
-                            .from(siteResourceLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, siteResourceLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-
-            conditions.push(or(...queryList));
-        }
-
        const baseQuery = querySiteResourcesBase().where(and(...conditions));

        const countQuery = db.$count(
@@ -328,51 +315,11 @@ export async function listAllSiteResourcesByOrg(
            countQuery
        ]);

-        const siteResourcesList = siteResourcesRaw.map(
-            transformSiteResourceRow
-        );
-
-        const siteResourceIdList = siteResourcesList.map(
-            (r) => r.siteResourceId
-        );
-
-        let labelsForSiteResources: Array<{
-            labelId: number;
-            name: string;
-            color: string;
-            siteResourceId: number;
-        }> = [];
-
-        if (isLabelFeatureEnabled && siteResourceIdList.length > 0) {
-            labelsForSiteResources = await db
-                .select({
-                    labelId: labels.labelId,
-                    name: labels.name,
-                    color: labels.color,
-                    siteResourceId: siteResourceLabels.siteResourceId
-                })
-                .from(labels)
-                .innerJoin(
-                    siteResourceLabels,
-                    eq(siteResourceLabels.labelId, labels.labelId)
-                )
-                .where(
-                    inArray(
-                        siteResourceLabels.siteResourceId,
-                        siteResourceIdList
-                    )
-                )
-                .orderBy(asc(siteResourceLabels.siteResourceLabelId));
-        }
+        const siteResourcesList = siteResourcesRaw.map(transformSiteResourceRow);

        return response<ListAllSiteResourcesByOrgResponse>(res, {
            data: {
-                siteResources: siteResourcesList.map((r) => ({
-                    ...r,
-                    labels: labelsForSiteResources.filter(
-                        (l) => l.siteResourceId === r.siteResourceId
-                    )
-                })),
+                siteResources: siteResourcesList,
                pagination: {
                    total: totalCount,
                    pageSize,
@@ -393,4 +340,4 @@ export async function listAllSiteResourcesByOrg(
            )
        );
    }
-}
+}
--- a/src/app/[orgId]/settings/(private)/labels/page.tsx
+++ b/src/app/[orgId]/settings/(private)/labels/page.tsx
@@ -1,63 +0,0 @@
-import { internal } from "@app/lib/api";
-import { authCookieHeader } from "@app/lib/api/cookies";
-import { ListOrgLabelsResponse } from "@server/routers/labels/types";
-import { AxiosResponse } from "axios";
-import OrgLabelsTable from "@app/components/OrgLabelsTable";
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import type { Metadata } from "next";
-import { getTranslations } from "next-intl/server";
-
-export const metadata: Metadata = {
-    title: "Labels"
-};
-
-type Props = {
-    params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
-};
-
-export const dynamic = "force-dynamic";
-
-export default async function LabelsPage({ params, searchParams }: Props) {
-    const { orgId } = await params;
-
-    const searchParamsObj = new URLSearchParams(await searchParams);
-
-    let labels: ListOrgLabelsResponse["labels"] = [];
-    let pagination: ListOrgLabelsResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
-
-    try {
-        const res = await internal.get<AxiosResponse<ListOrgLabelsResponse>>(
-            `/org/${orgId}/labels?${searchParamsObj.toString()}`,
-            await authCookieHeader()
-        );
-        const responseData = res.data.data;
-        labels = responseData.labels;
-        pagination = responseData.pagination;
-    } catch (e) {}
-
-    const t = await getTranslations();
-
-    return (
-        <>
-            <SettingsSectionTitle
-                title={t("labels")}
-                description={t("orgLabelsDescription")}
-            />
-
-            <OrgLabelsTable
-                labels={labels}
-                orgId={orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
-            />
-        </>
-    );
-}
--- a/src/app/[orgId]/settings/clients/machine/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/page.tsx
@@ -76,8 +76,7 @@ export default async function ClientsPage(props: ClientsPageProps) {
            agent: client.agent,
            archived: client.archived || false,
            blocked: client.blocked || false,
-            approvalState: client.approvalState ?? "approved",
-            labels: client.labels ?? []
+            approvalState: client.approvalState ?? "approved"
        };
    };

--- a/src/app/[orgId]/settings/clients/user/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/clients/user/[niceId]/general/page.tsx
@@ -153,65 +153,6 @@ export default function GeneralPage() {
    const [approvalId, setApprovalId] = useState<number | null>(null);
    const [isRefreshing, setIsRefreshing] = useState(false);
    const [, startTransition] = useTransition();
-    const [cacheCheck, setCacheCheck] = useState<null | {
-        consistent: boolean;
-        missingSiteResourceIds: number[];
-        extraSiteResourceIds: number[];
-        missingSiteIds: number[];
-        extraSiteIds: number[];
-        expectedSiteResourceIds: number[];
-        actualSiteResourceIds: number[];
-        expectedSiteIds: number[];
-        actualSiteIds: number[];
-    }>(null);
-    const [isCheckingCache, setIsCheckingCache] = useState(false);
-    const [isRebuildingCache, setIsRebuildingCache] = useState(false);
-
-    const handleRebuildCache = async () => {
-        if (!client.clientId) return;
-        setIsRebuildingCache(true);
-        try {
-            await api.post(
-                `/client/${client.clientId}/rebuild-associations-cache`
-            );
-            // Re-verify after rebuild so the result refreshes
-            const res = await api.get(
-                `/client/${client.clientId}/verify-associations-cache`
-            );
-            setCacheCheck(res.data.data);
-            toast({
-                title: "Cache rebuilt",
-                description: "Association cache rebuilt successfully."
-            });
-        } catch (e) {
-            toast({
-                variant: "destructive",
-                title: "Rebuild failed",
-                description: formatAxiosError(e, "Failed to rebuild cache")
-            });
-        } finally {
-            setIsRebuildingCache(false);
-        }
-    };
-
-    const handleVerifyCache = async () => {
-        if (!client.clientId) return;
-        setIsCheckingCache(true);
-        try {
-            const res = await api.get(
-                `/client/${client.clientId}/verify-associations-cache`
-            );
-            setCacheCheck(res.data.data);
-        } catch (e) {
-            toast({
-                variant: "destructive",
-                title: "Cache check failed",
-                description: formatAxiosError(e, "Failed to verify cache")
-            });
-        } finally {
-            setIsCheckingCache(false);
-        }
-    };
    const { env } = useEnvContext();

    const showApprovalFeatures =
@@ -903,75 +844,6 @@ export default function GeneralPage() {
                    </SettingsSectionBody>
                </SettingsSection>
            )}
-
-            {/* Hidden cache verification — subtle button, dev/admin diagnostic */}
-            <div className="mt-8 flex flex-col gap-2 items-start opacity-30 hover:opacity-100 transition-opacity">
-                <button
-                    type="button"
-                    onClick={handleVerifyCache}
-                    disabled={isCheckingCache}
-                    className="text-xs text-muted-foreground underline disabled:opacity-50"
-                    title="Verify the client's site association cache against current permissions (read-only)"
-                >
-                    {isCheckingCache
-                        ? "Checking cache…"
-                        : "Verify association cache"}
-                </button>
-                {cacheCheck && (
-                    <div
-                        className={
-                            "text-xs rounded border px-2 py-1 " +
-                            (cacheCheck.consistent
-                                ? "border-green-600 text-green-700"
-                                : "border-red-600 text-red-700")
-                        }
-                    >
-                        {cacheCheck.consistent ? (
-                            <span className="flex items-center gap-1">
-                                <CheckCircle2 className="h-3 w-3" />
-                                Cache is consistent
-                            </span>
-                        ) : (
-                            <div className="space-y-2">
-                                <div className="flex items-center gap-1 font-semibold">
-                                    <XCircle className="h-3 w-3" />
-                                    Cache is INCONSISTENT
-                                </div>
-                                <div>
-                                    Missing site resources: [
-                                    {cacheCheck.missingSiteResourceIds.join(
-                                        ", "
-                                    )}
-                                    ]
-                                </div>
-                                <div>
-                                    Extra site resources: [
-                                    {cacheCheck.extraSiteResourceIds.join(", ")}
-                                    ]
-                                </div>
-                                <div>
-                                    Missing sites: [
-                                    {cacheCheck.missingSiteIds.join(", ")}]
-                                </div>
-                                <div>
-                                    Extra sites: [
-                                    {cacheCheck.extraSiteIds.join(", ")}]
-                                </div>
-                                <button
-                                    type="button"
-                                    onClick={handleRebuildCache}
-                                    disabled={isRebuildingCache}
-                                    className="mt-1 text-xs underline font-semibold disabled:opacity-50"
-                                >
-                                    {isRebuildingCache
-                                        ? "Rebuilding…"
-                                        : "Rebuild cache now"}
-                                </button>
-                            </div>
-                        )}
-                    </div>
-                )}
-            </div>
        </SettingsContainer>
    );
 }
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -38,16 +38,11 @@ import { useUserContext } from "@app/hooks/useUserContext";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import type { OrgContextType } from "@app/contexts/orgContext";
-import { SwitchInput } from "@app/components/SwitchInput";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
-import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";

 // Schema for general organization settings
 const GeneralFormSchema = z.object({
    name: z.string(),
-    subnet: z.string().optional(),
-    settingsEnableGlobalNewtAutoUpdate: z.boolean().optional()
+    subnet: z.string().optional()
 });

 export default function GeneralPage() {
@@ -168,24 +163,17 @@ function GeneralSectionForm({ org }: SectionFormProps) {
        resolver: zodResolver(
            GeneralFormSchema.pick({
                name: true,
-                subnet: true,
-                settingsEnableGlobalNewtAutoUpdate: true
+                subnet: true
            })
        ),
        defaultValues: {
            name: org.name,
-            subnet: org.subnet || "",
-            settingsEnableGlobalNewtAutoUpdate:
-                org.settingsEnableGlobalNewtAutoUpdate ?? false
+            subnet: org.subnet || "" // Add default value for subnet
        },
        mode: "onChange"
    });
    const t = useTranslations();
    const router = useRouter();
-    const { isPaidUser } = usePaidStatus();
-    const hasAutoUpdateFeature = isPaidUser(
-        tierMatrix[TierFeature.NewtAutoUpdate]
-    );

    const [, formAction, loadingSave] = useActionState(performSave, null);
    const api = createApiClient(useEnvContext());
@@ -198,9 +186,7 @@ function GeneralSectionForm({ org }: SectionFormProps) {

        try {
            const reqData = {
-                name: data.name,
-                settingsEnableGlobalNewtAutoUpdate:
-                    data.settingsEnableGlobalNewtAutoUpdate
+                name: data.name
            } as any;

            // Update organization
@@ -208,16 +194,13 @@ function GeneralSectionForm({ org }: SectionFormProps) {

            // Update the org context to reflect the change in the info card
            updateOrg({
-                name: data.name,
-                settingsEnableGlobalNewtAutoUpdate:
-                    data.settingsEnableGlobalNewtAutoUpdate
+                name: data.name
            });

            toast({
                title: t("orgUpdated"),
                description: t("orgUpdatedDescription")
            });
-
            router.refresh();
        } catch (e) {
            toast({
@@ -260,31 +243,6 @@ function GeneralSectionForm({ org }: SectionFormProps) {
                                    </FormItem>
                                )}
                            />
-
-                            <PaidFeaturesAlert
-                                tiers={tierMatrix.newtAutoUpdate}
-                            />
-                            <FormField
-                                control={form.control}
-                                name="settingsEnableGlobalNewtAutoUpdate"
-                                render={({ field }) => (
-                                    <FormItem>
-                                        <FormControl>
-                                            <SwitchInput
-                                                id="settings-enable-global-newt-auto-update"
-                                                label={t("newtAutoUpdate")}
-                                                checked={field.value}
-                                                onCheckedChange={field.onChange}
-                                                disabled={!hasAutoUpdateFeature}
-                                            />
-                                        </FormControl>
-                                        <FormDescription>
-                                            {t("newtAutoUpdateDescription")}
-                                        </FormDescription>
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
                        </form>
                    </Form>
                </SettingsSectionForm>
--- a/src/app/[orgId]/settings/logs/connection/page.tsx
+++ b/src/app/[orgId]/settings/logs/connection/page.tsx
@@ -9,7 +9,7 @@ import { useEnvContext } from "@app/hooks/useEnvContext";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
 import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { createApiClient } from "@app/lib/api";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
 import { build } from "@server/build";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
@@ -294,7 +294,7 @@ export default function ConnectionLogsPage() {
        } catch (error) {
            toast({
                title: t("error"),
-                description: formatAxiosError(error),
+                description: t("Failed to filter logs"),
                variant: "destructive"
            });
        } finally {
--- a/src/app/[orgId]/settings/resources/client/page.tsx
+++ b/src/app/[orgId]/settings/resources/client/page.tsx
@@ -127,8 +127,7 @@ export default async function ClientResourcesPage(
                authDaemonPort: siteResource.authDaemonPort ?? null,
                subdomain: siteResource.subdomain ?? null,
                domainId: siteResource.domainId ?? null,
-                fullDomain: siteResource.fullDomain ?? null,
-                labels: siteResource.labels ?? []
+                fullDomain: siteResource.fullDomain ?? null
            };
        }
    );
--- a/src/app/[orgId]/settings/resources/proxy/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/page.tsx
@@ -111,7 +111,6 @@ export default async function ProxyResourcesPage(
            protocol: resource.protocol,
            proxyPort: resource.proxyPort,
            http: resource.http,
-            labels: resource.labels,
            authState: !resource.http
                ? "none"
                : resource.sso ||
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -36,53 +36,35 @@ import { useState } from "react";
 import { SwitchInput } from "@app/components/SwitchInput";
 import { ExternalLink } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useOrgContext } from "@app/hooks/useOrgContext";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
-import { Button as ButtonUI } from "@/components/ui/button";
-import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";

 const GeneralFormSchema = z.object({
    name: z.string().nonempty("Name is required"),
    niceId: z.string().min(1).max(255).optional(),
-    dockerSocketEnabled: z.boolean().optional(),
-    autoUpdateEnabled: z.boolean().optional(),
-    autoUpdateOverrideOrg: z.boolean().optional()
+    dockerSocketEnabled: z.boolean().optional()
 });

 type GeneralFormValues = z.infer<typeof GeneralFormSchema>;

 export default function GeneralPage() {
    const { site, updateSite } = useSiteContext();
-    const { org } = useOrgContext();

    const { env } = useEnvContext();
    const api = createApiClient(useEnvContext());
    const router = useRouter();
    const t = useTranslations();
    const { toast } = useToast();
-    const { isPaidUser } = usePaidStatus();
-    const hasAutoUpdateFeature = isPaidUser(
-        tierMatrix[TierFeature.NewtAutoUpdate]
-    );

    const [loading, setLoading] = useState(false);
    const [activeCidrTagIndex, setActiveCidrTagIndex] = useState<number | null>(
        null
    );

-    const orgAutoUpdate = org.org.settingsEnableGlobalNewtAutoUpdate ?? false;
-
    const form = useForm({
        resolver: zodResolver(GeneralFormSchema),
        defaultValues: {
            name: site?.name,
            niceId: site?.niceId || "",
-            dockerSocketEnabled: site?.dockerSocketEnabled ?? false,
-            autoUpdateEnabled: site?.autoUpdateOverrideOrg
-                ? (site?.autoUpdateEnabled ?? false)
-                : orgAutoUpdate,
-            autoUpdateOverrideOrg: site?.autoUpdateOverrideOrg ?? false
+            dockerSocketEnabled: site?.dockerSocketEnabled ?? false
        },
        mode: "onChange"
    });
@@ -94,17 +76,13 @@ export default function GeneralPage() {
            await api.post(`/site/${site?.siteId}`, {
                name: data.name,
                niceId: data.niceId,
-                dockerSocketEnabled: data.dockerSocketEnabled,
-                autoUpdateEnabled: data.autoUpdateEnabled,
-                autoUpdateOverrideOrg: data.autoUpdateOverrideOrg
+                dockerSocketEnabled: data.dockerSocketEnabled
            });

            updateSite({
                name: data.name,
                niceId: data.niceId,
-                dockerSocketEnabled: data.dockerSocketEnabled,
-                autoUpdateEnabled: data.autoUpdateEnabled,
-                autoUpdateOverrideOrg: data.autoUpdateOverrideOrg
+                dockerSocketEnabled: data.dockerSocketEnabled
            });

            if (data.niceId && data.niceId !== site?.niceId) {
@@ -221,9 +199,7 @@ export default function GeneralPage() {
                                                    {t.rich(
                                                        "enableDockerSocketDescription",
                                                        {
-                                                            docsLink: (
-                                                                chunks
-                                                            ) => (
+                                                            docsLink: (chunks) => (
                                                                <a
                                                                    href="https://docs.pangolin.net/manage/sites/configure-site#docker-socket-integration"
                                                                    target="_blank"
@@ -241,80 +217,6 @@ export default function GeneralPage() {
                                        )}
                                    />
                                )}
-
-                                <PaidFeaturesAlert
-                                    tiers={tierMatrix.newtAutoUpdate}
-                                />
-                                {site && site.type === "newt" && (
-                                    <FormField
-                                        control={form.control}
-                                        name="autoUpdateEnabled"
-                                        render={({ field }) => {
-                                            const isOverriding = form.watch(
-                                                "autoUpdateOverrideOrg"
-                                            );
-                                            return (
-                                                <FormItem>
-                                                    <FormControl>
-                                                        <div className="flex items-center gap-3">
-                                                            <SwitchInput
-                                                                id="auto-update-enabled"
-                                                                label={t(
-                                                                    "siteAutoUpdateLabel"
-                                                                )}
-                                                                checked={
-                                                                    field.value
-                                                                }
-                                                                onCheckedChange={(
-                                                                    checked
-                                                                ) => {
-                                                                    field.onChange(
-                                                                        checked
-                                                                    );
-                                                                    form.setValue(
-                                                                        "autoUpdateOverrideOrg",
-                                                                        true
-                                                                    );
-                                                                }}
-                                                                disabled={
-                                                                    !hasAutoUpdateFeature
-                                                                }
-                                                            />
-                                                            {isOverriding && (
-                                                                <ButtonUI
-                                                                    type="button"
-                                                                    variant="link"
-                                                                    size="sm"
-                                                                    className="h-auto p-0 pb-2 text-xs"
-                                                                    onClick={() => {
-                                                                        form.setValue(
-                                                                            "autoUpdateOverrideOrg",
-                                                                            false
-                                                                        );
-                                                                        form.setValue(
-                                                                            "autoUpdateEnabled",
-                                                                            orgAutoUpdate
-                                                                        );
-                                                                    }}
-                                                                >
-                                                                    {t(
-                                                                        "siteAutoUpdateResetToOrg"
-                                                                    )}
-                                                                </ButtonUI>
-                                                            )}
-                                                        </div>
-                                                    </FormControl>
-                                                    <FormDescription>
-                                                        {t(
-                                                            "siteAutoUpdateDescription"
-                                                        )}
-                                                    </FormDescription>
-                                                    <FormMessage />
-                                                </FormItem>
-                                            );
-                                        }}
-                                    />
-                                )}
                            </form>
                        </Form>
                    </SettingsSectionForm>
--- a/src/app/[orgId]/settings/sites/[niceId]/layout.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/layout.tsx
@@ -1,8 +1,6 @@
 import SiteProvider from "@app/providers/SiteProvider";
-import OrgProvider from "@app/providers/OrgProvider";
 import { internal } from "@app/lib/api";
 import { GetSiteResponse } from "@server/routers/site";
-import { GetOrgResponse } from "@server/routers/org";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
 import { authCookieHeader } from "@app/lib/api/cookies";
@@ -37,17 +35,6 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
        redirect(`/${params.orgId}/settings/sites`);
    }

-    let org = null;
-    try {
-        const res = await internal.get<AxiosResponse<GetOrgResponse>>(
-            `/org/${params.orgId}`,
-            await authCookieHeader()
-        );
-        org = res.data.data;
-    } catch {
-        redirect(`/${params.orgId}/settings/sites`);
-    }
-
    const t = await getTranslations();

    const navItems = [
@@ -77,14 +64,10 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
            />

            <SiteProvider site={site}>
-                <OrgProvider org={org}>
-                    <div className="space-y-4">
-                        <SiteInfoCard />
-                        <HorizontalTabs items={navItems}>
-                            {children}
-                        </HorizontalTabs>
-                    </div>
-                </OrgProvider>
+                <div className="space-y-4">
+                    <SiteInfoCard />
+                    <HorizontalTabs items={navItems}>{children}</HorizontalTabs>
+                </div>
            </SiteProvider>
        </>
    );
--- a/src/app/[orgId]/settings/sites/page.tsx
+++ b/src/app/[orgId]/settings/sites/page.tsx
@@ -60,7 +60,6 @@ export default async function SitesPage(props: SitesPageProps) {
        return {
            name: site.name,
            id: site.siteId,
-            labels: site.labels,
            nice: site.niceId.toString(),
            address: site.address?.split("/")[0],
            mbIn: formatSize(site.megabytesIn || 0, site.type),
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -23,7 +23,6 @@ import {
    Server,
    Settings,
    SquareMousePointer,
-    TagIcon,
    TicketCheck,
    Unplug,
    User,
@@ -100,7 +99,7 @@ export const orgNavSections = (
                href: "/{orgId}/settings/domains",
                icon: <Globe className="size-4 flex-none" />
            },
-            ...(build === "saas"
+            ...(build == "saas"
                ? [
                      {
                          title: "sidebarRemoteExitNodes",
@@ -238,19 +237,10 @@ export const orgNavSections = (
                        title: "sidebarApiKeys",
                        href: "/{orgId}/settings/api-keys",
                        icon: <KeyRound className="size-4 flex-none" />
-                    },
-                    ...(build !== "oss"
-                        ? [
-                              {
-                                  title: "labels",
-                                  href: "/{orgId}/settings/labels",
-                                  icon: <TagIcon className="size-4 flex-none" />
-                              }
-                          ]
-                        : [])
+                    }
                ]
            },
-            ...(build === "saas" && options?.isPrimaryOrg
+            ...(build == "saas" && options?.isPrimaryOrg
                ? [
                      {
                          title: "sidebarBillingAndLicenses",
--- a/src/components/AuthPageBrandingForm.tsx
+++ b/src/components/AuthPageBrandingForm.tsx
@@ -44,11 +44,77 @@ export type AuthPageCustomizationProps = {
 };

 const AuthPageFormSchema = z.object({
-    logoUrl: z
-        .string()
-        .optional()
-        .transform((val) => (val === "" ? undefined : val)),
+    logoUrl: z.union([
+        z.literal(""),
+        z.string().superRefine(async (urlOrPath, ctx) => {
+            const parseResult = z.url().safeParse(urlOrPath);
+            if (!parseResult.success) {
+                if (build !== "enterprise") {
+                    ctx.addIssue({
+                        code: "custom",
+                        message: "Must be a valid URL"
+                    });
+                    return;
+                } else {
+                    try {
+                        validateLocalPath(urlOrPath);
+                    } catch (error) {
+                        ctx.addIssue({
+                            code: "custom",
+                            message:
+                                "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
+                        });
+                    } finally {
+                        return;
+                    }
+                }
+            }

+            try {
+                const response = await fetch(urlOrPath, {
+                    method: "HEAD"
+                }).catch(() => {
+                    // If HEAD fails (CORS or method not allowed), try GET
+                    return fetch(urlOrPath, { method: "GET" });
+                });
+
+                if (response.status !== 200) {
+                    ctx.addIssue({
+                        code: "custom",
+                        message: `Failed to load image. Please check that the URL is accessible.`
+                    });
+                    return;
+                }
+
+                const contentType = response.headers.get("content-type") ?? "";
+                if (!contentType.startsWith("image/")) {
+                    ctx.addIssue({
+                        code: "custom",
+                        message: `URL does not point to an image. Please provide a URL to an image file (e.g., .png, .jpg, .svg).`
+                    });
+                    return;
+                }
+            } catch (error) {
+                let errorMessage =
+                    "Unable to verify image URL. Please check that the URL is accessible and points to an image file.";
+
+                if (
+                    error instanceof TypeError &&
+                    error.message.includes("fetch")
+                ) {
+                    errorMessage =
+                        "Network error: Unable to reach the URL. Please check your internet connection and verify the URL is correct.";
+                } else if (error instanceof Error) {
+                    errorMessage = `Error verifying URL: ${error.message}`;
+                }
+
+                ctx.addIssue({
+                    code: "custom",
+                    message: errorMessage
+                });
+            }
+        })
+    ]),
    logoWidth: z.coerce.number<number>().min(1),
    logoHeight: z.coerce.number<number>().min(1),
    orgTitle: z.string().optional(),
--- a/src/components/ClientResourcesTable.tsx
+++ b/src/components/ClientResourcesTable.tsx
@@ -2,6 +2,7 @@

 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import CopyToClipboard from "@app/components/CopyToClipboard";
+import { DataTable } from "@app/components/ui/data-table";
 import { ExtendedColumnDef } from "@app/components/ui/data-table";
 import { Badge } from "@app/components/ui/badge";
 import { Button } from "@app/components/ui/button";
@@ -29,21 +30,13 @@ import {
    ChevronDown,
    ChevronsUpDownIcon,
    Funnel,
-    MoreHorizontal,
-    PlusIcon
+    MoreHorizontal
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { Selectedsite, SitesSelector } from "@app/components/site-selector";
-import {
-    startTransition,
-    useEffect,
-    useMemo,
-    useOptimistic,
-    useState,
-    useTransition
-} from "react";
+import { useEffect, useMemo, useState, useTransition } from "react";
 import CreateInternalResourceDialog from "@app/components/CreateInternalResourceDialog";
 import EditInternalResourceDialog from "@app/components/EditInternalResourceDialog";
 import type { PaginationState } from "@tanstack/react-table";
@@ -60,10 +53,6 @@ import {
 } from "@app/components/ResourceSitesStatusCell";
 import { ResourceAccessCertIndicator } from "@app/components/ResourceAccessCertIndicator";
 import { build } from "@server/build";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
-import { LabelBadge } from "./label-badge";
-import { LabelsSelector, type SelectedLabel } from "./labels-selector";

 export type InternalResourceSiteRow = ResourceSiteRow;

@@ -95,11 +84,6 @@ export type InternalResourceRow = {
    subdomain?: string | null;
    domainId?: string | null;
    fullDomain?: string | null;
-    labels?: Array<{
-        labelId: number;
-        name: string;
-        color: string;
-    }>;
 };

 function formatDestinationDisplay(row: InternalResourceRow): string {
@@ -157,10 +141,7 @@ export default function ClientResourcesTable({
    const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
    const [siteFilterOpen, setSiteFilterOpen] = useState(false);

-    const [isRefreshing, startRefreshTransition] = useTransition();
-
-    const { isPaidUser } = usePaidStatus();
-    const isLabelFeatureEnabled = isPaidUser(tierMatrix.labels);
+    const [isRefreshing, startTransition] = useTransition();

    useEffect(() => {
        const interval = setInterval(() => {
@@ -186,7 +167,7 @@ export default function ClientResourcesTable({
    }, [initialFilterSite, siteIdQ, siteIdNum, t]);

    const refreshData = () => {
-        startRefreshTransition(() => {
+        startTransition(() => {
            try {
                router.refresh();
            } catch (error) {
@@ -204,8 +185,8 @@ export default function ClientResourcesTable({
        siteId: number
    ) => {
        try {
-            startTransition(async () => {
-                await api.delete(`/site-resource/${resourceId}`).then(() => {
+            await api.delete(`/site-resource/${resourceId}`).then(() => {
+                startTransition(() => {
                    router.refresh();
                    setIsDeleteModalOpen(false);
                });
@@ -273,333 +254,296 @@ export default function ClientResourcesTable({
        );
    }

-    const internalColumns = useMemo<
-        ExtendedColumnDef<InternalResourceRow>[]
-    >(() => {
-        const cols: ExtendedColumnDef<InternalResourceRow>[] = [
-            {
-                accessorKey: "name",
-                enableHiding: false,
-                friendlyName: t("name"),
-                header: () => {
-                    const nameOrder = getSortDirection("name", searchParams);
-                    const Icon =
-                        nameOrder === "asc"
-                            ? ArrowDown01Icon
-                            : nameOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+    const internalColumns: ExtendedColumnDef<InternalResourceRow>[] = [
+        {
+            accessorKey: "name",
+            enableHiding: false,
+            friendlyName: t("name"),
+            header: () => {
+                const nameOrder = getSortDirection("name", searchParams);
+                const Icon =
+                    nameOrder === "asc"
+                        ? ArrowDown01Icon
+                        : nameOrder === "desc"
+                          ? ArrowUp10Icon
+                          : ChevronsUpDownIcon;

-                    return (
-                        <Button
-                            variant="ghost"
-                            className="p-3"
-                            onClick={() => toggleSort("name")}
-                        >
-                            {t("name")}
-                            <Icon className="ml-2 h-4 w-4" />
-                        </Button>
-                    );
-                }
-            },
-            {
-                id: "niceId",
-                accessorKey: "niceId",
-                friendlyName: t("identifier"),
-                enableHiding: true,
-                header: ({ column }) => {
-                    return (
-                        <Button
-                            variant="ghost"
-                            onClick={() =>
-                                column.toggleSorting(
-                                    column.getIsSorted() === "asc"
-                                )
-                            }
-                        >
-                            {t("identifier")}
-                            <ArrowUpDown className="ml-2 h-4 w-4" />
-                        </Button>
-                    );
-                },
-                cell: ({ row }) => {
-                    return <span>{row.original.niceId || "-"}</span>;
-                }
-            },
-            {
-                id: "sites",
-                accessorFn: (row) =>
-                    row.sites.map((s) => s.siteName).join(", "),
-                friendlyName: t("sites"),
-                header: () => (
-                    <Popover
-                        open={siteFilterOpen}
-                        onOpenChange={setSiteFilterOpen}
+                return (
+                    <Button
+                        variant="ghost"
+                        className="p-3"
+                        onClick={() => toggleSort("name")}
                    >
-                        <PopoverTrigger asChild>
+                        {t("name")}
+                        <Icon className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
+        },
+        {
+            id: "niceId",
+            accessorKey: "niceId",
+            friendlyName: t("identifier"),
+            enableHiding: true,
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("identifier")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
+            cell: ({ row }) => {
+                return <span>{row.original.niceId || "-"}</span>;
+            }
+        },
+        {
+            id: "sites",
+            accessorFn: (row) => row.sites.map((s) => s.siteName).join(", "),
+            friendlyName: t("sites"),
+            header: () => (
+                <Popover open={siteFilterOpen} onOpenChange={setSiteFilterOpen}>
+                    <PopoverTrigger asChild>
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            role="combobox"
+                            className={cn(
+                                "justify-between text-sm h-8 px-2 w-full p-3",
+                                !selectedSite && "text-muted-foreground"
+                            )}
+                        >
+                            <div className="flex items-center gap-2 min-w-0">
+                                {t("sites")}
+                                <Funnel className="size-4 flex-none" />
+                                {selectedSite && (
+                                    <Badge
+                                        className="truncate max-w-[10rem]"
+                                        variant="secondary"
+                                    >
+                                        {selectedSite.name}
+                                    </Badge>
+                                )}
+                            </div>
+                        </Button>
+                    </PopoverTrigger>
+                    <PopoverContent
+                        className={dataTableFilterPopoverContentClassName}
+                        align="start"
+                    >
+                        <div className="border-b p-1">
                            <Button
                                type="button"
                                variant="ghost"
-                                role="combobox"
-                                className={cn(
-                                    "justify-between text-sm h-8 px-2 w-full p-3",
-                                    !selectedSite && "text-muted-foreground"
-                                )}
+                                size="sm"
+                                className="h-8 w-full justify-start font-normal"
+                                onClick={clearSiteFilter}
                            >
-                                <div className="flex items-center gap-2 min-w-0">
-                                    {t("sites")}
-                                    <Funnel className="size-4 flex-none" />
-                                    {selectedSite && (
-                                        <Badge
-                                            className="truncate max-w-[10rem]"
-                                            variant="secondary"
-                                        >
-                                            {selectedSite.name}
-                                        </Badge>
-                                    )}
-                                </div>
+                                {t("standaloneHcFilterAnySite")}
                            </Button>
-                        </PopoverTrigger>
-                        <PopoverContent
-                            className={dataTableFilterPopoverContentClassName}
-                            align="start"
-                        >
-                            <div className="border-b p-1">
-                                <Button
-                                    type="button"
-                                    variant="ghost"
-                                    size="sm"
-                                    className="h-8 w-full justify-start font-normal"
-                                    onClick={clearSiteFilter}
-                                >
-                                    {t("standaloneHcFilterAnySite")}
-                                </Button>
-                            </div>
-                            <SitesSelector
-                                orgId={orgId}
-                                selectedSite={selectedSite}
-                                onSelectSite={onPickSite}
-                            />
-                        </PopoverContent>
-                    </Popover>
-                ),
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
-                    return (
-                        <ResourceSitesStatusCell
-                            orgId={resourceRow.orgId}
-                            resourceSites={resourceRow.sites}
+                        </div>
+                        <SitesSelector
+                            orgId={orgId}
+                            selectedSite={selectedSite}
+                            onSelectSite={onPickSite}
                        />
-                    );
-                }
-            },
-            {
-                accessorKey: "mode",
-                friendlyName: t("editInternalResourceDialogMode"),
-                header: () => (
-                    <ColumnFilterButton
-                        options={[
-                            {
-                                value: "host",
-                                label: t("editInternalResourceDialogModeHost")
-                            },
-                            {
-                                value: "cidr",
-                                label: t("editInternalResourceDialogModeCidr")
-                            },
-                            {
-                                value: "http",
-                                label: t("editInternalResourceDialogModeHttp")
-                            }
-                        ]}
-                        selectedValue={searchParams.get("mode") ?? undefined}
-                        onValueChange={(value) =>
-                            handleFilterChange("mode", value)
-                        }
-                        searchPlaceholder={t("searchPlaceholder")}
-                        emptyMessage={t("emptySearchOptions")}
-                        label={t("editInternalResourceDialogMode")}
-                        className="p-3"
+                    </PopoverContent>
+                </Popover>
+            ),
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                return (
+                    <ResourceSitesStatusCell
+                        orgId={resourceRow.orgId}
+                        resourceSites={resourceRow.sites}
                    />
-                ),
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
-                    const modeLabels: Record<
-                        "host" | "cidr" | "port" | "http",
-                        string
-                    > = {
-                        host: t("editInternalResourceDialogModeHost"),
-                        cidr: t("editInternalResourceDialogModeCidr"),
-                        port: t("editInternalResourceDialogModePort"),
-                        http: t("editInternalResourceDialogModeHttp")
-                    };
-                    return <span>{modeLabels[resourceRow.mode]}</span>;
-                }
-            },
-            {
-                accessorKey: "destination",
-                friendlyName: t("resourcesTableDestination"),
-                header: () => (
-                    <span className="p-3">
-                        {t("resourcesTableDestination")}
-                    </span>
-                ),
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
-                    const display = formatDestinationDisplay(resourceRow);
+                );
+            }
+        },
+        {
+            accessorKey: "mode",
+            friendlyName: t("editInternalResourceDialogMode"),
+            header: () => (
+                <ColumnFilterButton
+                    options={[
+                        {
+                            value: "host",
+                            label: t("editInternalResourceDialogModeHost")
+                        },
+                        {
+                            value: "cidr",
+                            label: t("editInternalResourceDialogModeCidr")
+                        },
+                        {
+                            value: "http",
+                            label: t("editInternalResourceDialogModeHttp")
+                        }
+                    ]}
+                    selectedValue={searchParams.get("mode") ?? undefined}
+                    onValueChange={(value) => handleFilterChange("mode", value)}
+                    searchPlaceholder={t("searchPlaceholder")}
+                    emptyMessage={t("emptySearchOptions")}
+                    label={t("editInternalResourceDialogMode")}
+                    className="p-3"
+                />
+            ),
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                const modeLabels: Record<
+                    "host" | "cidr" | "port" | "http",
+                    string
+                > = {
+                    host: t("editInternalResourceDialogModeHost"),
+                    cidr: t("editInternalResourceDialogModeCidr"),
+                    port: t("editInternalResourceDialogModePort"),
+                    http: t("editInternalResourceDialogModeHttp")
+                };
+                return <span>{modeLabels[resourceRow.mode]}</span>;
+            }
+        },
+        {
+            accessorKey: "destination",
+            friendlyName: t("resourcesTableDestination"),
+            header: () => (
+                <span className="p-3">{t("resourcesTableDestination")}</span>
+            ),
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                const display = formatDestinationDisplay(resourceRow);
+                return (
+                    <CopyToClipboard
+                        text={display}
+                        isLink={false}
+                        displayText={display}
+                    />
+                );
+            }
+        },
+        {
+            accessorKey: "alias",
+            friendlyName: t("resourcesTableAlias"),
+            header: () => (
+                <span className="p-3">{t("resourcesTableAlias")}</span>
+            ),
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                if (resourceRow.mode === "host" && resourceRow.alias) {
                    return (
                        <CopyToClipboard
-                            text={display}
+                            text={resourceRow.alias}
                            isLink={false}
-                            displayText={display}
+                            displayText={resourceRow.alias}
                        />
                    );
                }
-            },
-            {
-                accessorKey: "alias",
-                friendlyName: t("resourcesTableAlias"),
-                header: () => (
-                    <span className="p-3">{t("resourcesTableAlias")}</span>
-                ),
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
-                    if (resourceRow.mode === "host" && resourceRow.alias) {
-                        return (
-                            <CopyToClipboard
-                                text={resourceRow.alias}
-                                isLink={false}
-                                displayText={resourceRow.alias}
-                            />
-                        );
-                    }
-                    if (resourceRow.mode === "http") {
-                        const domainId = resourceRow.domainId;
-                        const fullDomain = resourceRow.fullDomain;
-                        const url = `${resourceRow.ssl ? "https" : "http"}://${fullDomain}`;
-                        const did =
-                            build !== "oss" &&
-                            resourceRow.ssl &&
-                            domainId != null &&
-                            domainId !== "" &&
-                            fullDomain != null &&
-                            fullDomain !== "";
+                if (resourceRow.mode === "http") {
+                    const domainId = resourceRow.domainId;
+                    const fullDomain = resourceRow.fullDomain;
+                    const url = `${resourceRow.ssl ? "https" : "http"}://${fullDomain}`;
+                    const did =
+                        build !== "oss" &&
+                        resourceRow.ssl &&
+                        domainId != null &&
+                        domainId !== "" &&
+                        fullDomain != null &&
+                        fullDomain !== "";

-                        return (
-                            <div className="flex items-center gap-2 min-w-0">
-                                {did ? (
-                                    <ResourceAccessCertIndicator
-                                        orgId={resourceRow.orgId}
-                                        domainId={domainId}
-                                        fullDomain={fullDomain}
-                                    />
-                                ) : null}
-                                <div className="">
-                                    <CopyToClipboard
-                                        text={url}
-                                        isLink={isSafeUrlForLink(url)}
-                                        displayText={url}
-                                    />
-                                </div>
-                            </div>
-                        );
-                    }
-                    return <span>-</span>;
-                }
-            },
-            {
-                accessorKey: "aliasAddress",
-                friendlyName: t("resourcesTableAliasAddress"),
-                enableHiding: true,
-                header: () => (
-                    <div className="flex items-center gap-2 p-3">
-                        <span>{t("resourcesTableAliasAddress")}</span>
-                        <InfoPopup info={t("resourcesTableAliasAddressInfo")} />
-                    </div>
-                ),
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
-                    return resourceRow.aliasAddress ? (
-                        <CopyToClipboard
-                            text={resourceRow.aliasAddress}
-                            isLink={false}
-                            displayText={resourceRow.aliasAddress}
-                        />
-                    ) : (
-                        <span>-</span>
-                    );
-                }
-            },
-            {
-                id: "actions",
-                enableHiding: false,
-                header: () => <span className="p-3"></span>,
-                cell: ({ row }) => {
-                    const resourceRow = row.original;
                    return (
-                        <div className="flex items-center gap-2 justify-end">
-                            <DropdownMenu>
-                                <DropdownMenuTrigger asChild>
-                                    <Button
-                                        variant="ghost"
-                                        className="h-8 w-8 p-0"
-                                    >
-                                        <span className="sr-only">
-                                            {t("openMenu")}
-                                        </span>
-                                        <MoreHorizontal className="h-4 w-4" />
-                                    </Button>
-                                </DropdownMenuTrigger>
-                                <DropdownMenuContent align="end">
-                                    <DropdownMenuItem
-                                        onClick={() => {
-                                            setSelectedInternalResource(
-                                                resourceRow
-                                            );
-                                            setIsDeleteModalOpen(true);
-                                        }}
-                                    >
-                                        <span className="text-red-500">
-                                            {t("delete")}
-                                        </span>
-                                    </DropdownMenuItem>
-                                </DropdownMenuContent>
-                            </DropdownMenu>
-                            <Button
-                                variant={"outline"}
-                                onClick={() => {
-                                    setEditingResource(resourceRow);
-                                    setIsEditDialogOpen(true);
-                                }}
-                            >
-                                {t("edit")}
-                            </Button>
+                        <div className="flex items-center gap-2 min-w-0">
+                            {did ? (
+                                <ResourceAccessCertIndicator
+                                    orgId={resourceRow.orgId}
+                                    domainId={domainId}
+                                    fullDomain={fullDomain}
+                                />
+                            ) : null}
+                            <div className="">
+                                <CopyToClipboard
+                                    text={url}
+                                    isLink={isSafeUrlForLink(url)}
+                                    displayText={url}
+                                />
+                            </div>
                        </div>
                    );
                }
+                return <span>-</span>;
            }
-        ];
-
-        if (isLabelFeatureEnabled) {
-            cols.splice(cols.length - 1, 0, {
-                id: "labels",
-                accessorKey: "labels",
-                header: () => (
-                    <span className="p-3 text-end w-full inline-block">
-                        {t("labels")}
-                    </span>
-                ),
-                cell: ({ row }: { row: { original: InternalResourceRow } }) => (
-                    <ClientResourceLabelCell
-                        resource={row.original}
-                        orgId={orgId}
+        },
+        {
+            accessorKey: "aliasAddress",
+            friendlyName: t("resourcesTableAliasAddress"),
+            enableHiding: true,
+            header: () => (
+                <div className="flex items-center gap-2 p-3">
+                    <span>{t("resourcesTableAliasAddress")}</span>
+                    <InfoPopup info={t("resourcesTableAliasAddressInfo")} />
+                </div>
+            ),
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                return resourceRow.aliasAddress ? (
+                    <CopyToClipboard
+                        text={resourceRow.aliasAddress}
+                        isLink={false}
+                        displayText={resourceRow.aliasAddress}
                    />
-                )
-            });
+                ) : (
+                    <span>-</span>
+                );
+            }
+        },
+        {
+            id: "actions",
+            enableHiding: false,
+            header: () => <span className="p-3"></span>,
+            cell: ({ row }) => {
+                const resourceRow = row.original;
+                return (
+                    <div className="flex items-center gap-2 justify-end">
+                        <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                                <Button variant="ghost" className="h-8 w-8 p-0">
+                                    <span className="sr-only">
+                                        {t("openMenu")}
+                                    </span>
+                                    <MoreHorizontal className="h-4 w-4" />
+                                </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end">
+                                <DropdownMenuItem
+                                    onClick={() => {
+                                        setSelectedInternalResource(
+                                            resourceRow
+                                        );
+                                        setIsDeleteModalOpen(true);
+                                    }}
+                                >
+                                    <span className="text-red-500">
+                                        {t("delete")}
+                                    </span>
+                                </DropdownMenuItem>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                        <Button
+                            variant={"outline"}
+                            onClick={() => {
+                                setEditingResource(resourceRow);
+                                setIsEditDialogOpen(true);
+                            }}
+                        >
+                            {t("edit")}
+                        </Button>
+                    </div>
+                );
+            }
        }
-
-        return cols;
-    }, [isLabelFeatureEnabled, orgId, t, searchParams]);
+    ];

    function handleFilterChange(
        column: string,
@@ -694,8 +638,7 @@ export default function ClientResourcesTable({
                enableColumnVisibility
                columnVisibility={{
                    niceId: false,
-                    aliasAddress: false,
-                    labels: false
+                    aliasAddress: false
                }}
                stickyLeftColumn="name"
                stickyRightColumn="actions"
@@ -731,101 +674,3 @@ export default function ClientResourcesTable({
        </>
    );
 }
-
-type ClientResourceLabelCellProps = {
-    resource: InternalResourceRow;
-    orgId: string;
-};
-
-function ClientResourceLabelCell({
-    resource,
-    orgId
-}: ClientResourceLabelCellProps) {
-    const t = useTranslations();
-    const api = createApiClient(useEnvContext());
-    const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-    const router = useRouter();
-
-    const labels = resource.labels ?? [];
-    const [optimisticLabels, setOptimisticLabels] = useOptimistic(labels);
-
-    function toggleResourceLabel(
-        label: SelectedLabel,
-        action: "attach" | "detach"
-    ) {
-        startTransition(async () => {
-            try {
-                if (action === "attach") {
-                    setOptimisticLabels([...optimisticLabels, label]);
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/attach`,
-                        { siteResourceId: resource.id }
-                    );
-                } else {
-                    setOptimisticLabels(
-                        optimisticLabels.filter(
-                            (lb) => lb.labelId !== label.labelId
-                        )
-                    );
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/detach`,
-                        { siteResourceId: resource.id }
-                    );
-                }
-            } catch (e) {
-                toast({
-                    title: t("error"),
-                    description: formatAxiosError(e, t("errorOccurred")),
-                    variant: "destructive"
-                });
-            } finally {
-                router.refresh();
-            }
-        });
-    }
-
-    return (
-        <div className="inline-flex flex-wrap items-center justify-end w-full gap-1">
-            {optimisticLabels.slice(0, 3).map((label) => (
-                <LabelBadge
-                    key={label.labelId}
-                    onClick={() => setIsPopoverOpen(true)}
-                    {...label}
-                />
-            ))}
-            {optimisticLabels.length > 3 && (
-                <Button
-                    variant="outline"
-                    className={cn(
-                        "inline-flex gap-1 items-center",
-                        "rounded-full text-sm cursor-pointer",
-                        "px-1.5 py-0 h-auto"
-                    )}
-                    onClick={() => setIsPopoverOpen(true)}
-                >
-                    +{optimisticLabels.length - 3}
-                </Button>
-            )}
-            <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
-                <PopoverTrigger asChild>
-                    <Button
-                        size="icon"
-                        variant="outline"
-                        className="p-1 size-auto rounded-full"
-                        title={t("addLabels")}
-                    >
-                        <span className="sr-only">{t("addLabels")}</span>
-                        <PlusIcon className="size-3" />
-                    </Button>
-                </PopoverTrigger>
-                <PopoverContent align="center" className="p-0 w-full">
-                    <LabelsSelector
-                        orgId={orgId}
-                        selectedLabels={optimisticLabels}
-                        toggleLabel={toggleResourceLabel}
-                    />
-                </PopoverContent>
-            </Popover>
-        </div>
-    );
-}
--- a/src/components/CreateInternalResourceDialog.tsx
+++ b/src/components/CreateInternalResourceDialog.tsx
@@ -16,7 +16,7 @@ import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
 import { AxiosResponse } from "axios";
 import { useTranslations } from "next-intl";
-import { useState, useTransition } from "react";
+import { useState } from "react";
 import {
    cleanForFQDN,
    InternalResourceForm,
@@ -39,30 +39,30 @@ export default function CreateInternalResourceDialog({
 }: CreateInternalResourceDialogProps) {
    const t = useTranslations();
    const api = createApiClient(useEnvContext());
+    const [isSubmitting, setIsSubmitting] = useState(false);
    const [isHttpModeDisabled, setIsHttpModeDisabled] = useState(false);
-    const [isSubmitting, startTransition] = useTransition();

-    function handleSubmit(values: InternalResourceFormValues) {
-        startTransition(async () => {
-            try {
-                let data = { ...values };
-                if (
-                    (data.mode === "host" || data.mode === "http") &&
-                    isHostname(data.destination)
-                ) {
-                    const currentAlias = data.alias?.trim() || "";
-                    if (!currentAlias) {
-                        let aliasValue = data.destination;
-                        if (data.destination.toLowerCase() === "localhost") {
-                            aliasValue = `${cleanForFQDN(data.name)}.internal`;
-                        }
-                        data = { ...data, alias: aliasValue };
+    async function handleSubmit(values: InternalResourceFormValues) {
+        setIsSubmitting(true);
+        try {
+            let data = { ...values };
+            if (
+                (data.mode === "host" || data.mode === "http") &&
+                isHostname(data.destination)
+            ) {
+                const currentAlias = data.alias?.trim() || "";
+                if (!currentAlias) {
+                    let aliasValue = data.destination;
+                    if (data.destination.toLowerCase() === "localhost") {
+                        aliasValue = `${cleanForFQDN(data.name)}.internal`;
                    }
+                    data = { ...data, alias: aliasValue };
                }
+            }

-                await api.put<
-                    AxiosResponse<{ data: { siteResourceId: number } }>
-                >(`/org/${orgId}/site-resource`, {
+            await api.put<AxiosResponse<{ data: { siteResourceId: number } }>>(
+                `/org/${orgId}/site-resource`,
+                {
                    name: data.name,
                    siteIds: data.siteIds,
                    mode: data.mode,
@@ -106,30 +106,32 @@ export default function CreateInternalResourceDialog({
                    clientIds: data.clients
                        ? data.clients.map((c) => parseInt(c.id))
                        : []
-                });
+                }
+            );

-                toast({
-                    title: t("createInternalResourceDialogSuccess"),
-                    description: t(
-                        "createInternalResourceDialogInternalResourceCreatedSuccessfully"
-                    ),
-                    variant: "default"
-                });
-                setOpen(false);
-                onSuccess?.();
-            } catch (error) {
-                toast({
-                    title: t("createInternalResourceDialogError"),
-                    description: formatAxiosError(
-                        error,
-                        t(
-                            "createInternalResourceDialogFailedToCreateInternalResource"
-                        )
-                    ),
-                    variant: "destructive"
-                });
-            }
-        });
+            toast({
+                title: t("createInternalResourceDialogSuccess"),
+                description: t(
+                    "createInternalResourceDialogInternalResourceCreatedSuccessfully"
+                ),
+                variant: "default"
+            });
+            setOpen(false);
+            onSuccess?.();
+        } catch (error) {
+            toast({
+                title: t("createInternalResourceDialogError"),
+                description: formatAxiosError(
+                    error,
+                    t(
+                        "createInternalResourceDialogFailedToCreateInternalResource"
+                    )
+                ),
+                variant: "destructive"
+            });
+        } finally {
+            setIsSubmitting(false);
+        }
    }

    return (
--- a/src/components/CreateOrgLabelDialog.tsx
+++ b/src/components/CreateOrgLabelDialog.tsx
@@ -1,102 +0,0 @@
-"use client";
-
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import type { CreateOrEditLabelResponse } from "@server/routers/labels/types";
-import type { AxiosResponse } from "axios";
-import { useTranslations } from "next-intl";
-import { useTransition } from "react";
-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaClose,
-    CredenzaContent,
-    CredenzaDescription,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "./Credenza";
-import { OrgLabelForm } from "./OrgLabelForm";
-import { Button } from "./ui/button";
-
-export type CreateOrgLabelDialogProps = {
-    open: boolean;
-    setOpen: (val: boolean) => void;
-    orgId: string;
-    onSuccess?: () => void;
-};
-
-export function CreateOrgLabelDialog({
-    open,
-    setOpen,
-    orgId,
-    onSuccess
-}: CreateOrgLabelDialogProps) {
-    const t = useTranslations();
-    const api = createApiClient(useEnvContext());
-    const [isSubmitting, startTransition] = useTransition();
-
-    async function createOrgLabel(data: { name: string; color: string }) {
-        try {
-            const res = await api.post<
-                AxiosResponse<CreateOrEditLabelResponse>
-            >(`/org/${orgId}/labels`, data);
-
-            if (res.status === 201) {
-                setOpen(false);
-                onSuccess?.();
-
-                toast({
-                    title: t("success"),
-                    description: t("labelCreateSuccessMessage")
-                });
-            }
-        } catch (e) {
-            toast({
-                title: t("error"),
-                description: formatAxiosError(e, t("errorOccurred")),
-                variant: "destructive"
-            });
-        }
-    }
-
-    return (
-        <Credenza open={open} onOpenChange={setOpen}>
-            <CredenzaContent className="md:max-w-md">
-                <CredenzaHeader>
-                    <CredenzaTitle>{t("createLabelDialogTitle")}</CredenzaTitle>
-                    <CredenzaDescription>
-                        {t("createLabelDialogDescription")}
-                    </CredenzaDescription>
-                </CredenzaHeader>
-                <CredenzaBody>
-                    <OrgLabelForm
-                        onSubmit={(data) => {
-                            startTransition(async () => createOrgLabel(data));
-                        }}
-                    />
-                </CredenzaBody>
-                <CredenzaFooter>
-                    <CredenzaClose asChild>
-                        <Button
-                            variant="outline"
-                            onClick={() => setOpen(false)}
-                            disabled={isSubmitting}
-                        >
-                            {t("cancel")}
-                        </Button>
-                    </CredenzaClose>
-                    <Button
-                        type="submit"
-                        form="org-label-form"
-                        disabled={isSubmitting}
-                        loading={isSubmitting}
-                    >
-                        {t("labelCreate")}
-                    </Button>
-                </CredenzaFooter>
-            </CredenzaContent>
-        </Credenza>
-    );
-}
--- a/src/components/DeviceLoginForm.tsx
+++ b/src/components/DeviceLoginForm.tsx
@@ -318,28 +318,12 @@ export default function DeviceLoginForm({
                                    <FormControl>
                                        <div className="flex justify-center">
                                            <InputOTP
-                                                maxLength={8}
+                                                maxLength={9}
                                                pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
                                                {...field}
                                                value={field.value
                                                    .replace(/-/g, "")
                                                    .toUpperCase()}
-                                                onPaste={(event) => {
-                                                    event.preventDefault();
-                                                    const pastedText =
-                                                        event.clipboardData.getData(
-                                                            "text"
-                                                        );
-                                                    const cleanedValue =
-                                                        pastedText
-                                                            .replace(
-                                                                /[^a-zA-Z0-9]/g,
-                                                                ""
-                                                            )
-                                                            .toUpperCase()
-                                                            .slice(0, 8);
-                                                    field.onChange(cleanedValue);
-                                                }}
                                                onChange={(value) => {
                                                    // Strip hyphens and convert to uppercase
                                                    const cleanedValue = value
--- a/src/components/EditOrgLabelDialog.tsx
+++ b/src/components/EditOrgLabelDialog.tsx
@@ -1,109 +0,0 @@
-"use client";
-
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import type { CreateOrEditLabelResponse } from "@server/routers/labels/types";
-import type { AxiosResponse } from "axios";
-import { useTranslations } from "next-intl";
-import { useTransition } from "react";
-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaClose,
-    CredenzaContent,
-    CredenzaDescription,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "./Credenza";
-import { OrgLabelForm } from "./OrgLabelForm";
-import { Button } from "./ui/button";
-
-export type EditOrgLabelDialogProps = {
-    open: boolean;
-    setOpen: (val: boolean) => void;
-    orgId: string;
-    onSuccess?: () => void;
-    label: {
-        name: string;
-        color: string;
-        labelId: number;
-    };
-};
-
-export function EditOrgLabelDialog({
-    open,
-    setOpen,
-    orgId,
-    onSuccess,
-    label
-}: EditOrgLabelDialogProps) {
-    const t = useTranslations();
-    const api = createApiClient(useEnvContext());
-    const [isSubmitting, startTransition] = useTransition();
-
-    async function editOrgLabel(data: { name: string; color: string }) {
-        try {
-            const res = await api.patch<
-                AxiosResponse<CreateOrEditLabelResponse>
-            >(`/org/${orgId}/label/${label.labelId}`, data);
-
-            if (res.status === 200) {
-                setOpen(false);
-                onSuccess?.();
-
-                toast({
-                    title: t("success"),
-                    description: t("labelEditSuccessMessage")
-                });
-            }
-        } catch (e) {
-            toast({
-                title: t("error"),
-                description: formatAxiosError(e, t("errorOccurred")),
-                variant: "destructive"
-            });
-        }
-    }
-
-    return (
-        <Credenza open={open} onOpenChange={setOpen}>
-            <CredenzaContent className="md:max-w-md">
-                <CredenzaHeader>
-                    <CredenzaTitle>{t("editLabelDialogTitle")}</CredenzaTitle>
-                    <CredenzaDescription>
-                        {t("editLabelDialogDescription")}
-                    </CredenzaDescription>
-                </CredenzaHeader>
-                <CredenzaBody>
-                    <OrgLabelForm
-                        defaultValue={label}
-                        onSubmit={(data) => {
-                            startTransition(async () => editOrgLabel(data));
-                        }}
-                    />
-                </CredenzaBody>
-                <CredenzaFooter>
-                    <CredenzaClose asChild>
-                        <Button
-                            variant="outline"
-                            onClick={() => setOpen(false)}
-                            disabled={isSubmitting}
-                        >
-                            {t("cancel")}
-                        </Button>
-                    </CredenzaClose>
-                    <Button
-                        type="submit"
-                        form="org-label-form"
-                        disabled={isSubmitting}
-                        loading={isSubmitting}
-                    >
-                        {t("labelEdit")}
-                    </Button>
-                </CredenzaFooter>
-            </CredenzaContent>
-        </Credenza>
-    );
-}
--- a/src/components/MachineClientsTable.tsx
+++ b/src/components/MachineClientsTable.tsx
@@ -10,11 +10,8 @@ import {
    DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { cn } from "@app/lib/cn";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import {
    ArrowRight,
    ArrowUpDown,
@@ -22,26 +19,12 @@ import {
    CircleSlash,
    ArrowDown01Icon,
    ArrowUp10Icon,
-    ChevronsUpDownIcon,
-    PlusIcon
+    ChevronsUpDownIcon
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import {
-    startTransition,
-    useMemo,
-    useOptimistic,
-    useState,
-    useTransition
-} from "react";
-import { LabelBadge } from "./label-badge";
-import { LabelsSelector, type SelectedLabel } from "./labels-selector";
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger
-} from "./ui/popover";
+import { useMemo, useState, useTransition } from "react";
 import { Badge } from "./ui/badge";
 import type { PaginationState } from "@tanstack/react-table";
 import { ControlledDataTable } from "./ui/controlled-data-table";
@@ -70,11 +53,6 @@ export type ClientRow = {
    archived?: boolean;
    blocked?: boolean;
    approvalState: "approved" | "pending" | "denied";
-    labels?: Array<{
-        labelId: number;
-        name: string;
-        color: string;
-    }>;
 };

 type ClientTableProps = {
@@ -106,21 +84,17 @@ export default function MachineClientsTable({
    );

    const api = createApiClient(useEnvContext());
-    const [isRefreshing, startRefreshTransition] = useTransition();
+    const [isRefreshing, startTransition] = useTransition();
    const [isNavigatingToAddPage, startNavigation] = useTransition();

-    const { isPaidUser } = usePaidStatus();
-    const isLabelFeatureEnabled = isPaidUser(tierMatrix.labels);
-
    const defaultMachineColumnVisibility = {
        subnet: false,
        userId: false,
-        niceId: false,
-        labels: false
+        niceId: false
    };

    const refreshData = () => {
-        startRefreshTransition(() => {
+        startTransition(() => {
            try {
                router.refresh();
            } catch (error) {
@@ -410,24 +384,6 @@ export default function MachineClientsTable({
            }
        ];

-        if (isLabelFeatureEnabled) {
-            baseColumns.push({
-                id: "labels",
-                accessorKey: "labels",
-                header: () => (
-                    <span className="p-3 text-end w-full inline-block">
-                        {t("labels")}
-                    </span>
-                ),
-                cell: ({ row }: { row: { original: ClientRow } }) => (
-                    <MachineClientLabelCell
-                        client={row.original}
-                        orgId={orgId}
-                    />
-                )
-            });
-        }
-
        // Only include actions column if there are rows without userIds
        if (hasRowsWithoutUserId) {
            baseColumns.push({
@@ -508,7 +464,7 @@ export default function MachineClientsTable({
        }

        return baseColumns;
-    }, [hasRowsWithoutUserId, isLabelFeatureEnabled, orgId, t, searchParams]);
+    }, [hasRowsWithoutUserId, t, getSortDirection, toggleSort]);

    const booleanSearchFilterSchema = z
        .enum(["true", "false"])
@@ -635,95 +591,3 @@ export default function MachineClientsTable({
        </>
    );
 }
-
-type MachineClientLabelCellProps = {
-    client: ClientRow;
-    orgId: string;
-};
-
-function MachineClientLabelCell({ client, orgId }: MachineClientLabelCellProps) {
-    const t = useTranslations();
-    const api = createApiClient(useEnvContext());
-    const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-    const router = useRouter();
-
-    const labels = client.labels ?? [];
-    const [optimisticLabels, setOptimisticLabels] = useOptimistic(labels);
-
-    function toggleClientLabel(label: SelectedLabel, action: "attach" | "detach") {
-        startTransition(async () => {
-            try {
-                if (action === "attach") {
-                    setOptimisticLabels([...optimisticLabels, label]);
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/attach`,
-                        { clientId: client.id }
-                    );
-                } else {
-                    setOptimisticLabels(
-                        optimisticLabels.filter(
-                            (lb) => lb.labelId !== label.labelId
-                        )
-                    );
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/detach`,
-                        { clientId: client.id }
-                    );
-                }
-            } catch (e) {
-                toast({
-                    title: t("error"),
-                    description: formatAxiosError(e, t("errorOccurred")),
-                    variant: "destructive"
-                });
-            } finally {
-                router.refresh();
-            }
-        });
-    }
-
-    return (
-        <div className="inline-flex flex-wrap items-center justify-end w-full gap-1">
-            {optimisticLabels.slice(0, 3).map((label) => (
-                <LabelBadge
-                    key={label.labelId}
-                    onClick={() => setIsPopoverOpen(true)}
-                    {...label}
-                />
-            ))}
-            {optimisticLabels.length > 3 && (
-                <Button
-                    variant="outline"
-                    className={cn(
-                        "inline-flex gap-1 items-center",
-                        "rounded-full text-sm cursor-pointer",
-                        "px-1.5 py-0 h-auto"
-                    )}
-                    onClick={() => setIsPopoverOpen(true)}
-                >
-                    +{optimisticLabels.length - 3}
-                </Button>
-            )}
-            <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
-                <PopoverTrigger asChild>
-                    <Button
-                        size="icon"
-                        variant="outline"
-                        className="p-1 size-auto rounded-full"
-                        title={t("addLabels")}
-                    >
-                        <span className="sr-only">{t("addLabels")}</span>
-                        <PlusIcon className="size-3" />
-                    </Button>
-                </PopoverTrigger>
-                <PopoverContent align="center" className="p-0 w-full">
-                    <LabelsSelector
-                        orgId={orgId}
-                        selectedLabels={optimisticLabels}
-                        toggleLabel={toggleClientLabel}
-                    />
-                </PopoverContent>
-            </Popover>
-        </div>
-    );
-}
--- a/src/components/OrgLabelForm.tsx
+++ b/src/components/OrgLabelForm.tsx
@@ -1,126 +0,0 @@
-"use client";
-
-import z from "zod";
-import { Input } from "./ui/input";
-import { useTranslations } from "use-intl";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import {
-    Form,
-    FormControl,
-    FormField,
-    FormItem,
-    FormLabel,
-    FormMessage
-} from "./ui/form";
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue
-} from "./ui/select";
-import { LABEL_COLORS } from "./labels-selector";
-
-const labelFormSchema = z.object({
-    name: z.string().nonempty(),
-    color: z
-        .string()
-        .regex(/^#?([0-9a-f]{6}|[0-9a-f]{3})$/i)
-        .nonempty()
-});
-
-export type LabelFormData = z.infer<typeof labelFormSchema>;
-
-export type OrgLabelFormProps = {
-    onSubmit: (data: LabelFormData) => void;
-    defaultValue?: LabelFormData;
-};
-
-export function OrgLabelForm({ onSubmit, defaultValue }: OrgLabelFormProps) {
-    const t = useTranslations();
-
-    const colorValues = Object.values(LABEL_COLORS);
-    const randomColor =
-        colorValues[Math.floor(Math.random() * colorValues.length)];
-
-    const form = useForm({
-        resolver: zodResolver(labelFormSchema),
-        defaultValues: {
-            name: defaultValue?.name ?? "",
-            color: defaultValue?.color ?? randomColor
-        }
-    });
-
-    return (
-        <Form {...form}>
-            <form
-                id="org-label-form"
-                className="flex flex-col gap-4 px-0.5"
-                action={async () => {
-                    if (await form.trigger()) {
-                        onSubmit(form.getValues());
-                    }
-                }}
-            >
-                <FormField
-                    control={form.control}
-                    name="name"
-                    render={({ field }) => (
-                        <FormItem>
-                            <FormLabel>{t("labelNameField")}</FormLabel>
-                            <FormControl>
-                                <Input
-                                    {...field}
-                                    placeholder={t("labelPlaceholder")}
-                                />
-                            </FormControl>
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-
-                <FormField
-                    control={form.control}
-                    name="color"
-                    render={({ field }) => (
-                        <FormItem>
-                            <FormLabel>{t("labelColorField")}</FormLabel>
-                            <Select
-                                onValueChange={field.onChange}
-                                value={field.value}
-                            >
-                                <SelectTrigger className="w-full">
-                                    <SelectValue
-                                        placeholder={t("selectColor")}
-                                    />
-                                </SelectTrigger>
-                                <SelectContent>
-                                    {Object.entries(LABEL_COLORS).map(
-                                        ([color, value]) => (
-                                            <SelectItem
-                                                value={value}
-                                                key={color}
-                                                className="flex items-center gap-2"
-                                            >
-                                                <div
-                                                    className="size-4 rounded-full bg-(--color) flex-none"
-                                                    style={{
-                                                        // @ts-expect-error css color
-                                                        "--color": value
-                                                    }}
-                                                />
-                                                <span data-name>{color}</span>
-                                            </SelectItem>
-                                        )
-                                    )}
-                                </SelectContent>
-                            </Select>
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-            </form>
-        </Form>
-    );
-}
--- a/src/components/OrgLabelsTable.tsx
+++ b/src/components/OrgLabelsTable.tsx
@@ -1,240 +0,0 @@
-"use client";
-
-import { Button } from "@app/components/ui/button";
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger
-} from "@app/components/ui/dropdown-menu";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { type PaginationState } from "@tanstack/react-table";
-import {
-    ArrowDown01Icon,
-    ArrowUp10Icon,
-    ChevronsUpDownIcon,
-    MoreHorizontal,
-    PencilIcon,
-    PencilLineIcon
-} from "lucide-react";
-import { useTranslations } from "next-intl";
-import { usePathname, useRouter } from "next/navigation";
-import { useActionState, useMemo, useState, useTransition } from "react";
-import { useDebouncedCallback } from "use-debounce";
-import {
-    ControlledDataTable,
-    type ExtendedColumnDef
-} from "./ui/controlled-data-table";
-import { LabelBadge } from "./label-badge";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
-import { cn } from "@app/lib/cn";
-import ConfirmDeleteDialog from "./ConfirmDeleteDialog";
-import { CreateOrgLabelDialog } from "./CreateOrgLabelDialog";
-import { EditOrgLabelDialog } from "./EditOrgLabelDialog";
-
-export type LabelRow = {
-    labelId: number;
-    name: string;
-    color: string;
-};
-
-type OrgLabelsTableProps = {
-    labels: LabelRow[];
-    pagination: PaginationState;
-    orgId: string;
-    rowCount: number;
-};
-
-export default function OrgLabelsTable({
-    labels,
-    orgId,
-    pagination,
-    rowCount
-}: OrgLabelsTableProps) {
-    const router = useRouter();
-
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
-
-    const [selectedLabel, setSelectedLabel] = useState<LabelRow | null>(null);
-    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-    const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-    const [isEditModalOpen, setIsEditModalOpen] = useState(false);
-
-    const [isRefreshing, startTransition] = useTransition();
-
-    const api = createApiClient(useEnvContext());
-    const t = useTranslations();
-
-    function refreshData() {
-        startTransition(async () => {
-            try {
-                router.refresh();
-            } catch {
-                toast({
-                    title: t("error"),
-                    description: t("refreshError"),
-                    variant: "destructive"
-                });
-            }
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({ searchParams });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({ searchParams });
-    }, 300);
-
-    const columns = useMemo<ExtendedColumnDef<LabelRow>[]>(
-        () => [
-            {
-                accessorKey: "name",
-                enableHiding: false,
-                header: () => {
-                    return <span className="p-3">{t("name")}</span>;
-                },
-                cell: ({ row }) => (
-                    <div className="flex items-center gap-1.5 group">
-                        <div
-                            className="size-2.5 rounded-full bg-(--color) flex-none"
-                            style={{
-                                // @ts-expect-error css color
-                                "--color": row.original.color
-                            }}
-                        />
-
-                        {row.original.name}
-                    </div>
-                )
-            },
-            {
-                accessorKey: "actions",
-                enableHiding: false,
-                header: () => {
-                    return <span className="p-3">{t("actions")}</span>;
-                },
-                cell: ({ row }) => (
-                    <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                            <Button variant="ghost" className="h-8 w-8 p-0">
-                                <span className="sr-only">{t("openMenu")}</span>
-                                <MoreHorizontal className="h-4 w-4" />
-                            </Button>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent align="end">
-                            <DropdownMenuItem
-                                onClick={() => {
-                                    setSelectedLabel(row.original);
-                                    setIsEditModalOpen(true);
-                                }}
-                            >
-                                {t("edit")}
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                                onClick={() => {
-                                    setSelectedLabel(row.original);
-                                    setIsDeleteModalOpen(true);
-                                }}
-                            >
-                                <span className="text-red-500">
-                                    {t("delete")}
-                                </span>
-                            </DropdownMenuItem>
-                        </DropdownMenuContent>
-                    </DropdownMenu>
-                )
-            }
-        ],
-        [searchParams, t]
-    );
-
-    function deleteLabel(label: LabelRow) {
-        startTransition(async () => {
-            await api
-                .delete(`/org/${orgId}/label/${label.labelId}`)
-                .catch((e) => {
-                    toast({
-                        variant: "destructive",
-                        title: t("labelErrorDelete"),
-                        description: formatAxiosError(e, t("labelErrorDelete"))
-                    });
-                })
-                .then(() => {
-                    router.refresh();
-                    setIsDeleteModalOpen(false);
-                });
-        });
-    }
-
-    return (
-        <>
-            {selectedLabel && (
-                <>
-                    <ConfirmDeleteDialog
-                        open={isDeleteModalOpen}
-                        setOpen={(val) => {
-                            setIsDeleteModalOpen(val);
-                            setSelectedLabel(null);
-                        }}
-                        dialog={
-                            <div className="space-y-2">
-                                <p>{t("labelQuestionRemove")}</p>
-                                <p>{t("labelMessageRemove")}</p>
-                            </div>
-                        }
-                        buttonText={t("labelDeleteConfirm")}
-                        onConfirm={async () => deleteLabel(selectedLabel)}
-                        string={selectedLabel.name}
-                        title={t("labelDelete")}
-                    />
-
-                    <EditOrgLabelDialog
-                        open={isEditModalOpen}
-                        setOpen={setIsEditModalOpen}
-                        orgId={orgId}
-                        onSuccess={() =>
-                            startTransition(() => router.refresh())
-                        }
-                        label={selectedLabel}
-                    />
-                </>
-            )}
-
-            <CreateOrgLabelDialog
-                open={isCreateModalOpen}
-                setOpen={setIsCreateModalOpen}
-                orgId={orgId}
-                onSuccess={() => startTransition(() => router.refresh())}
-            />
-
-            <ControlledDataTable
-                columns={columns}
-                rows={labels}
-                addButtonText={t("labelAdd")}
-                onAdd={() => setIsCreateModalOpen(true)}
-                tableId="org-labels-table"
-                searchPlaceholder={t("labelSearch")}
-                pagination={pagination}
-                onPaginationChange={handlePaginationChange}
-                searchQuery={searchParams.get("query")?.toString()}
-                onSearch={handleSearchChange}
-                onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                rowCount={rowCount}
-            />
-        </>
-    );
-}
--- a/src/components/ProxyResourcesTable.tsx
+++ b/src/components/ProxyResourcesTable.tsx
--- a/src/components/RoleForm.tsx
+++ b/src/components/RoleForm.tsx
@@ -46,20 +46,6 @@ function toSshSudoMode(value: string | null | undefined): SshSudoMode {
    return "none";
 }

-function hasOnlyAbsoluteSudoCommands(value: string | undefined): boolean {
-    if (!value?.trim()) return true;
-
-    const commands = value
-        .split(",")
-        .map((command) => command.trim())
-        .filter(Boolean);
-
-    return commands.every((command) => {
-        const executable = command.split(/\s+/)[0];
-        return executable.startsWith("/");
-    });
-}
-
 export type RoleFormValues = {
    name: string;
    description?: string;
@@ -88,33 +74,19 @@ export function RoleForm({
    const { isPaidUser } = usePaidStatus();
    const { env } = useEnvContext();

-    const formSchema = z
-        .object({
-            name: z
-                .string({ message: t("nameRequired") })
-                .min(1)
-                .max(32),
-            description: z.string().max(255).optional(),
-            requireDeviceApproval: z.boolean().optional(),
-            allowSsh: z.boolean().optional(),
-            sshSudoMode: z.enum(SSH_SUDO_MODE_VALUES),
-            sshSudoCommands: z.string().optional(),
-            sshCreateHomeDir: z.boolean().optional(),
-            sshUnixGroups: z.string().optional()
-        })
-        .superRefine((values, ctx) => {
-            if (
-                values.sshSudoMode === "commands" &&
-                !hasOnlyAbsoluteSudoCommands(values.sshSudoCommands)
-            ) {
-                ctx.addIssue({
-                    code: z.ZodIssueCode.custom,
-                    path: ["sshSudoCommands"],
-                    message:
-                        "Each sudo command must start with an absolute path (for example, /usr/bin/systemctl)."
-                });
-            }
-        });
+    const formSchema = z.object({
+        name: z
+            .string({ message: t("nameRequired") })
+            .min(1)
+            .max(32),
+        description: z.string().max(255).optional(),
+        requireDeviceApproval: z.boolean().optional(),
+        allowSsh: z.boolean().optional(),
+        sshSudoMode: z.enum(SSH_SUDO_MODE_VALUES),
+        sshSudoCommands: z.string().optional(),
+        sshCreateHomeDir: z.boolean().optional(),
+        sshUnixGroups: z.string().optional()
+    });

    const defaultValues: RoleFormValues = role
        ? {
@@ -324,9 +296,7 @@ export function RoleForm({
                                    control={form.control}
                                    name="allowSsh"
                                    render={({ field }) => {
-                                        const allowSshOptions: OptionSelectOption<
-                                            "allow" | "disallow"
-                                        >[] = [
+                                        const allowSshOptions: OptionSelectOption<"allow" | "disallow">[] = [
                                            {
                                                value: "allow",
                                                label: t("roleAllowSshAllow")
@@ -341,9 +311,7 @@ export function RoleForm({
                                                <FormLabel>
                                                    {t("roleAllowSsh")}
                                                </FormLabel>
-                                                <OptionSelect<
-                                                    "allow" | "disallow"
-                                                >
+                                                <OptionSelect<"allow" | "disallow">
                                                    options={allowSshOptions}
                                                    value={
                                                        sshDisabled
@@ -354,9 +322,7 @@ export function RoleForm({
                                                    }
                                                    onChange={(v) => {
                                                        if (sshDisabled) return;
-                                                        field.onChange(
-                                                            v === "allow"
-                                                        );
+                                                        field.onChange(v === "allow");
                                                    }}
                                                    cols={2}
                                                    disabled={sshDisabled}
--- a/src/components/SitesTable.tsx
+++ b/src/components/SitesTable.tsx
@@ -3,16 +3,6 @@
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import UptimeMiniBar from "@app/components/UptimeMiniBar";

-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaContent,
-    CredenzaDescription,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "@app/components/Credenza";
-import SiteResourcesOverview from "@app/components/SiteResourcesOverview";
 import { Badge } from "@app/components/ui/badge";
 import { Button } from "@app/components/ui/button";
 import {
@@ -24,9 +14,9 @@ import {
 import { InfoPopup } from "@app/components/ui/info-popup";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useNavigationContext } from "@app/hooks/useNavigationContext";
+import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
 import { build } from "@server/build";
 import { type PaginationState } from "@tanstack/react-table";
 import {
@@ -36,35 +26,30 @@ import {
    ArrowUpRight,
    ChevronDown,
    ChevronsUpDownIcon,
-    MoreHorizontal,
-    PlusIcon
+    MoreHorizontal
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
-import {
-    startTransition,
-    useEffect,
-    useMemo,
-    useOptimistic,
-    useState,
-    useTransition
-} from "react";
+import { useState, useTransition, useEffect } from "react";
 import { useDebouncedCallback } from "use-debounce";
 import z from "zod";
 import { ColumnFilterButton } from "./ColumnFilterButton";
+import SiteResourcesOverview from "@app/components/SiteResourcesOverview";
+import {
+    Credenza,
+    CredenzaBody,
+    CredenzaContent,
+    CredenzaDescription,
+    CredenzaFooter,
+    CredenzaHeader,
+    CredenzaTitle
+} from "@app/components/Credenza";
 import {
    ControlledDataTable,
    type ExtendedColumnDef
 } from "./ui/controlled-data-table";

-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { cn } from "@app/lib/cn";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
-import { LabelBadge } from "./label-badge";
-import { LabelsSelector, type SelectedLabel } from "./labels-selector";
-import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
-
 export type SiteRow = {
    id: number;
    nice: string;
@@ -81,11 +66,6 @@ export type SiteRow = {
    exitNodeEndpoint?: string;
    remoteExitNodeId?: string;
    resourceCount: number;
-    labels?: Array<{
-        labelId: number;
-        name: string;
-        color: string;
-    }>;
 };

 type SitesTableProps = {
@@ -116,9 +96,6 @@ export default function SitesTable({
    const [isRefreshing, startTransition] = useTransition();
    const [isNavigatingToAddPage, startNavigation] = useTransition();

-    const { isPaidUser } = usePaidStatus();
-    const isLabelFeatureEnabled = isPaidUser(tierMatrix.labels);
-
    const api = createApiClient(useEnvContext());
    const t = useTranslations();

@@ -181,8 +158,7 @@ export default function SitesTable({
        });
    }

-    const columns = useMemo<ExtendedColumnDef<SiteRow>[]>(() => {
-        const cols: ExtendedColumnDef<SiteRow>[] = [
+    const columns: ExtendedColumnDef<SiteRow>[] = [
        {
            accessorKey: "name",
            enableHiding: false,
@@ -390,7 +366,7 @@ export default function SitesTable({
                        variant="ghost"
                        size="sm"
                        onClick={() => setResourcesDialogSite(siteRow)}
-                        className="flex h-8 items-center gap-2 px-2 font-normal"
+                        className="flex h-8 items-center gap-2 px-0 font-normal"
                    >
                        <span className="text-sm tabular-nums">
                            {siteRow.resourceCount} {t("resources")}
@@ -461,7 +437,7 @@ export default function SitesTable({
            header: () => {
                return <span className="p-3">{t("address")}</span>;
            },
-            cell: ({ row }) => {
+            cell: ({ row }: { row: any }) => {
                const originalRow = row.original;
                return originalRow.address ? (
                    <div className="flex items-center space-x-2">
@@ -512,6 +488,16 @@ export default function SitesTable({
                                        {t("sitesTableViewPrivateResources")}
                                    </DropdownMenuItem>
                                </Link>
+                                <DropdownMenuItem
+                                    onClick={() => {
+                                        setSelectedSite(siteRow);
+                                        setIsDeleteModalOpen(true);
+                                    }}
+                                >
+                                    <span className="text-red-500">
+                                        {t("delete")}
+                                    </span>
+                                </DropdownMenuItem>
                            </DropdownMenuContent>
                        </DropdownMenu>
                        <Link
@@ -526,24 +512,7 @@ export default function SitesTable({
                );
            }
        }
-        ];
-
-        if (isLabelFeatureEnabled) {
-            cols.splice(cols.length - 1, 0, {
-                accessorKey: "labels",
-                header: () => (
-                    <span className="p-3 text-end w-full inline-block">
-                        {t("labels")}
-                    </span>
-                ),
-                cell: ({ row }: { row: { original: SiteRow } }) => (
-                    <SiteLabelCell site={row.original} orgId={orgId} />
-                )
-            });
-        }
-
-        return cols;
-    }, [isLabelFeatureEnabled, orgId, t, searchParams]);
+    ];

    function toggleSort(column: string) {
        const newSearch = getNextSortOrder(column, searchParams);
@@ -653,8 +622,7 @@ export default function SitesTable({
                    niceId: false,
                    nice: false,
                    exitNode: false,
-                    address: false,
-                    labels: false
+                    address: false
                }}
                enableColumnVisibility
                stickyLeftColumn="name"
@@ -663,102 +631,3 @@ export default function SitesTable({
        </>
    );
 }
-
-type SiteLabelCellProps = {
-    site: SiteRow;
-    orgId: string;
-};
-
-function SiteLabelCell({ site, orgId }: SiteLabelCellProps) {
-    const t = useTranslations();
-
-    const api = createApiClient(useEnvContext());
-
-    const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-
-    const router = useRouter();
-
-    const labels = site.labels ?? [];
-    const [optimisticLabels, setOptimisticLabels] = useOptimistic(labels);
-
-    function toggleSiteLabel(
-        label: SelectedLabel,
-        action: "attach" | "detach"
-    ) {
-        startTransition(async () => {
-            try {
-                if (action === "attach") {
-                    setOptimisticLabels([...optimisticLabels, label]);
-
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/attach`,
-                        { siteId: site.id }
-                    );
-                } else {
-                    setOptimisticLabels(
-                        optimisticLabels.filter(
-                            (lb) => lb.labelId !== label.labelId
-                        )
-                    );
-                    await api.put(
-                        `/org/${orgId}/label/${label.labelId}/detach`,
-                        { siteId: site.id }
-                    );
-                }
-            } catch (e) {
-                toast({
-                    title: t("error"),
-                    description: formatAxiosError(e, t("errorOccurred")),
-                    variant: "destructive"
-                });
-            } finally {
-                router.refresh();
-            }
-        });
-    }
-
-    return (
-        <div className="inline-flex flex-wrap items-center justify-end w-full gap-1">
-            {optimisticLabels.slice(0, 3).map((label) => (
-                <LabelBadge
-                    key={label.labelId}
-                    onClick={() => setIsPopoverOpen(true)}
-                    {...label}
-                />
-            ))}
-            {optimisticLabels.length > 3 && (
-                <Button
-                    variant="outline"
-                    className={cn(
-                        "inline-flex gap-1 items-center",
-                        "rounded-full text-sm cursor-pointer",
-                        "px-1.5 py-0 h-auto"
-                    )}
-                    onClick={() => setIsPopoverOpen(true)}
-                >
-                    +{optimisticLabels.length - 3}
-                </Button>
-            )}
-            <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
-                <PopoverTrigger asChild>
-                    <Button
-                        size="icon"
-                        variant="outline"
-                        className="p-1 size-auto rounded-full"
-                        title={t("addLabels")}
-                    >
-                        <span className="sr-only">{t("addLabels")}</span>
-                        <PlusIcon className="size-3" />
-                    </Button>
-                </PopoverTrigger>
-                <PopoverContent align="center" className="p-0 w-full">
-                    <LabelsSelector
-                        orgId={orgId}
-                        selectedLabels={optimisticLabels}
-                        toggleLabel={toggleSiteLabel}
-                    />
-                </PopoverContent>
-            </Popover>
-        </div>
-    );
-}
--- a/src/components/SwitchInput.tsx
+++ b/src/components/SwitchInput.tsx
@@ -45,16 +45,7 @@ export function SwitchInput({
    return (
        <div>
            <div className="flex items-center space-x-2 mb-2">
-                {label && (
-                    <Label
-                        htmlFor={id}
-                        className={
-                            disabled ? "opacity-50 cursor-not-allowed" : ""
-                        }
-                    >
-                        {label}
-                    </Label>
-                )}
+                {label && <Label htmlFor={id}>{label}</Label>}
                <Switch
                    id={id}
                    checked={checked}
--- a/src/components/label-badge.tsx
+++ b/src/components/label-badge.tsx
@@ -1,40 +0,0 @@
-import { cn } from "@app/lib/cn";
-import { Button } from "./ui/button";
-
-export type LabelBadgeProps = {
-    name: string;
-    color: string;
-    onClick?: () => void;
-    className?: string;
-};
-
-export function LabelBadge({
-    onClick,
-    name,
-    color,
-    className
-}: LabelBadgeProps) {
-    return (
-        <Button
-            variant="outline"
-            onClick={onClick}
-            className={cn(
-                "inline-flex gap-1 items-center",
-                "rounded-full text-sm cursor-pointer",
-                "pl-1.5 pr-2 py-0 h-auto",
-                className
-            )}
-        >
-            <div
-                className="size-3 rounded-full bg-(--color) flex-none"
-                style={{
-                    // @ts-expect-error css color
-                    "--color": color
-                }}
-            />
-            <span className="whitespace-nowrap text-ellipsis max-w-16 overflow-hidden relative">
-                {name}
-            </span>
-        </Button>
-    );
-}
--- a/src/components/labels-selector.tsx
+++ b/src/components/labels-selector.tsx
@@ -1,236 +0,0 @@
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { orgQueries } from "@app/lib/queries";
-import type { CreateOrEditLabelResponse } from "@server/routers/labels/types";
-import { useQuery } from "@tanstack/react-query";
-import type { AxiosResponse } from "axios";
-import { useTranslations } from "next-intl";
-import { useActionState, useMemo, useState } from "react";
-import { useDebounce } from "use-debounce";
-import { Button } from "./ui/button";
-import { Checkbox } from "./ui/checkbox";
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList
-} from "./ui/command";
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue
-} from "./ui/select";
-
-export type SelectedLabel = {
-    name: string;
-    color: string;
-    labelId: number;
-};
-
-export type LabelsSelectorProps = {
-    orgId: string;
-    selectedLabels: SelectedLabel[];
-    toggleLabel: (newlabel: SelectedLabel, action: "detach" | "attach") => void;
-};
-
-export const LABEL_COLORS = {
-    red: "#ff6467",
-    green: "#05df72",
-    blue: "#51a2ff",
-    yellow: "#fdc744",
-    orange: "#ff8905",
-    purple: "#a684ff",
-    gray: "#b4b4b4"
-};
-
-export function LabelsSelector({
-    orgId,
-    selectedLabels,
-    toggleLabel
-}: LabelsSelectorProps) {
-    const t = useTranslations();
-    const [labelSearchQuery, setlabelsSearchQuery] = useState("");
-    const [debouncedQuery] = useDebounce(labelSearchQuery, 150);
-
-    const api = createApiClient(useEnvContext());
-
-    const { data: labels = [] } = useQuery(
-        orgQueries.labels({
-            orgId,
-            query: debouncedQuery,
-            perPage: 10
-        })
-    );
-
-    const labelsShown = useMemo(() => {
-        const base = [...labels];
-        if (debouncedQuery.trim().length === 0 && selectedLabels.length > 0) {
-            const selectedNotInBase = selectedLabels.filter(
-                (sel) => !base.some((s) => s.labelId === sel.labelId)
-            );
-            return [...selectedNotInBase, ...base];
-        }
-        return base;
-    }, [debouncedQuery, labels, selectedLabels]);
-
-    const selectedIds = useMemo(
-        () => new Set(selectedLabels.map((s) => s.labelId)),
-        [selectedLabels]
-    );
-
-    const colorValues = Object.values(LABEL_COLORS);
-    const randomColor =
-        colorValues[Math.floor(Math.random() * colorValues.length)];
-
-    const [, action, isPending] = useActionState(createLabel, null);
-
-    async function createLabel(_: any, formData: FormData) {
-        const name = formData.get("name")?.toString();
-        const color = formData.get("color")?.toString();
-        try {
-            const res = await api.post<
-                AxiosResponse<CreateOrEditLabelResponse>
-            >(`/org/${orgId}/labels`, { name, color });
-
-            const { label } = res.data.data;
-
-            toggleLabel(
-                {
-                    labelId: label.labelId,
-                    name: label.name,
-                    color: label.color
-                },
-                "attach"
-            );
-        } catch (e) {
-            toast({
-                title: t("error"),
-                description: formatAxiosError(e, t("errorOccurred")),
-                variant: "destructive"
-            });
-        }
-        setlabelsSearchQuery("");
-    }
-
-    return (
-        <Command shouldFilter={false}>
-            <CommandInput
-                placeholder={t("labelSearch")}
-                value={labelSearchQuery}
-                onValueChange={setlabelsSearchQuery}
-            />
-            <CommandList>
-                <CommandEmpty className="px-3 break-all wrap-anywhere text-wrap">
-                    {labelSearchQuery.trim().length > 0 ? (
-                        <div className="flex flex-col gap-2 items-center">
-                            <span className="max-w-34">
-                                {t("createNewLabel", {
-                                    label: labelSearchQuery.trim()
-                                })}
-                            </span>
-
-                            <form
-                                action={action}
-                                className="flex items-center gap-2"
-                            >
-                                <input
-                                    type="hidden"
-                                    name="name"
-                                    value={labelSearchQuery.trim()}
-                                />
-
-                                <Select defaultValue={randomColor} name="color">
-                                    <SelectTrigger className="w-18 [&_[data-name]]:hidden [&_[svg]]:hidden!">
-                                        <SelectValue
-                                            placeholder={t("selectColor")}
-                                        />
-                                    </SelectTrigger>
-                                    <SelectContent>
-                                        {Object.entries(LABEL_COLORS).map(
-                                            ([color, value]) => (
-                                                <SelectItem
-                                                    value={value}
-                                                    key={color}
-                                                    className="flex items-center gap-2"
-                                                >
-                                                    <div
-                                                        className="size-4 rounded-full bg-(--color) flex-none"
-                                                        style={{
-                                                            // @ts-expect-error css color
-                                                            "--color": value
-                                                        }}
-                                                    />
-                                                    <span data-name>
-                                                        {color}
-                                                    </span>
-                                                </SelectItem>
-                                            )
-                                        )}
-                                    </SelectContent>
-                                </Select>
-
-                                <Button
-                                    variant="outline"
-                                    size="sm"
-                                    loading={isPending}
-                                    type="submit"
-                                >
-                                    {t("create")}
-                                </Button>
-                            </form>
-                        </div>
-                    ) : (
-                        t("labelsNotFound")
-                    )}
-                </CommandEmpty>
-                <CommandGroup>
-                    {labelsShown.map((label) => (
-                        <CommandItem
-                            key={label.labelId}
-                            value={`${label.labelId}`}
-                            onSelect={() => {
-                                toggleLabel(
-                                    label,
-                                    selectedIds.has(label.labelId)
-                                        ? "detach"
-                                        : "attach"
-                                );
-                                // } else {
-                                //     onSelectionChange([
-                                //         ...selectedLabels,
-                                //         label
-                                //     ]);
-                                // }
-                            }}
-                        >
-                            <Checkbox
-                                className="pointer-events-none shrink-0"
-                                checked={selectedIds.has(label.labelId)}
-                                onCheckedChange={() => {}}
-                                aria-hidden
-                                tabIndex={-1}
-                            />
-                            <div className="min-w-0 flex-1 flex items-center gap-2">
-                                <span
-                                    className="inline-block size-3 flex-none rounded-full bg-(--label-color)"
-                                    style={{
-                                        // @ts-expect-error CSS variable
-                                        "--label-color": label.color
-                                    }}
-                                />
-                                <span className="min-w-0 flex-1 truncate">
-                                    {label.name}
-                                </span>
-                            </div>
-                        </CommandItem>
-                    ))}
-                </CommandGroup>
-            </CommandList>
-        </Command>
-    );
-}
--- a/src/components/multi-select/multi-select-tag-input.tsx
+++ b/src/components/multi-select/multi-select-tag-input.tsx
@@ -41,7 +41,7 @@ export function MultiSelectTagInput<T extends TagValue>({
                            variant: "outline"
                        }),
                        "justify-between w-full inline-flex",
-                        "text-muted-foreground pl-1.5 cursor-text h-auto py-1",
+                        "text-muted-foreground pl-1.5 cursor-text",
                        "hover:bg-transparent hover:text-muted-foreground",
                        props.disabled && "pointer-events-none opacity-50"
                    )}
@@ -49,7 +49,7 @@ export function MultiSelectTagInput<T extends TagValue>({
                    <span
                        className={cn(
                            "inline-flex items-center gap-1",
-                            "overflow-x-auto flex-wrap h-auto"
+                            "overflow-x-auto"
                        )}
                    >
                        {props.value.map((option) => (
@@ -61,9 +61,7 @@ export function MultiSelectTagInput<T extends TagValue>({
                                )}
                                onClick={(e) => e.stopPropagation()}
                            >
-                                <span className="max-w-40 text-ellipsis overflow-hidden">
-                                    {option.text}
-                                </span>
+                                {option.text}
                                <button
                                    className="p-0.5 flex-none cursor-pointer"
                                    type="button"
--- a/src/components/ui/controlled-data-table.tsx
+++ b/src/components/ui/controlled-data-table.tsx
@@ -305,7 +305,6 @@ export function ControlledDataTable<TData, TValue>({
                                        onSearch(e.currentTarget.value)
                                    }
                                    className="w-full pl-8"
-                                    type="search"
                                />
                                <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2 text-muted-foreground" />
                            </div>
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -33,7 +33,6 @@ import { remote } from "./api";
 import { durationToMs } from "./durationToMs";
 import { ListHealthChecksResponse } from "@server/routers/healthChecks/types";
 import { StatusHistoryResponse } from "@server/lib/statusHistory";
-import type { ListOrgLabelsResponse } from "@server/routers/labels/types";

 export type ProductUpdate = {
    link: string | null;
@@ -209,33 +208,6 @@ export const orgQueries = {
            }
        }),

-    labels: ({
-        orgId,
-        query,
-        perPage = 10_000
-    }: {
-        orgId: string;
-        query?: string;
-        perPage?: number;
-    }) =>
-        queryOptions({
-            queryKey: ["ORG", orgId, "LABELS", { query, perPage }] as const,
-            queryFn: async ({ signal, meta }) => {
-                const sp = new URLSearchParams({
-                    pageSize: perPage.toString()
-                });
-
-                if (query?.trim()) {
-                    sp.set("query", query);
-                }
-
-                const res = await meta!.api.get<
-                    AxiosResponse<ListOrgLabelsResponse>
-                >(`/org/${orgId}/labels?${sp.toString()}`, { signal });
-                return res.data.data.labels;
-            }
-        }),
-
    domains: ({ orgId }: { orgId: string }) =>
        queryOptions({
            queryKey: ["ORG", orgId, "DOMAINS"] as const,
Author	SHA1	Message	Date
Owen Schwartz	022576c1f5	New translations en-us.json (Spanish) [ci skip]	2026-05-21 17:36:31 -07:00
Owen Schwartz	86520b5b4b	New translations en-us.json (Norwegian Bokmal) [ci skip]	2026-05-21 17:36:29 -07:00
Owen Schwartz	9d481db697	New translations en-us.json (Chinese Simplified) [ci skip]	2026-05-21 17:36:28 -07:00
Owen Schwartz	607d2e543b	New translations en-us.json (Turkish) [ci skip]	2026-05-21 17:36:26 -07:00
Owen Schwartz	4d4f4dff4c	New translations en-us.json (Russian) [ci skip]	2026-05-21 17:36:23 -07:00
Owen Schwartz	5f41fef0cd	New translations en-us.json (Portuguese) [ci skip]	2026-05-21 17:36:21 -07:00
Owen Schwartz	ad6cbacd90	New translations en-us.json (Polish) [ci skip]	2026-05-21 17:36:19 -07:00
Owen Schwartz	fa7315fbc8	New translations en-us.json (Dutch) [ci skip]	2026-05-21 17:36:17 -07:00
Owen Schwartz	095a0ab001	New translations en-us.json (Korean) [ci skip]	2026-05-21 17:36:15 -07:00
Owen Schwartz	3e7eaf7e06	New translations en-us.json (Italian) [ci skip]	2026-05-21 17:36:13 -07:00
Owen Schwartz	4b804abc5d	New translations en-us.json (German) [ci skip]	2026-05-21 17:36:11 -07:00
Owen Schwartz	6c3145455d	New translations en-us.json (Czech) [ci skip]	2026-05-21 17:36:09 -07:00
Owen Schwartz	9008811605	New translations en-us.json (Bulgarian) [ci skip]	2026-05-21 17:36:07 -07:00
Owen Schwartz	39afd13ac9	New translations en-us.json (French) [ci skip]	2026-05-21 17:36:04 -07:00
Owen Schwartz	1f94ee48b5	New translations en-us.json (Spanish) [ci skip]	2026-05-19 20:52:15 -07:00
Owen Schwartz	729a3b3007	New translations en-us.json (Norwegian Bokmal) [ci skip]	2026-05-19 20:52:13 -07:00
Owen Schwartz	51f163f94f	New translations en-us.json (Chinese Simplified) [ci skip]	2026-05-19 20:52:11 -07:00
Owen Schwartz	2eddbd544c	New translations en-us.json (Turkish) [ci skip]	2026-05-19 20:52:09 -07:00
Owen Schwartz	9e670682a6	New translations en-us.json (Russian) [ci skip]	2026-05-19 20:52:07 -07:00
Owen Schwartz	c3ccf0e513	New translations en-us.json (Portuguese) [ci skip]	2026-05-19 20:52:06 -07:00
Owen Schwartz	3e2e5a87e1	New translations en-us.json (Polish) [ci skip]	2026-05-19 20:52:04 -07:00
Owen Schwartz	ccfc702376	New translations en-us.json (Dutch) [ci skip]	2026-05-19 20:52:02 -07:00
Owen Schwartz	86c8f3de30	New translations en-us.json (Korean) [ci skip]	2026-05-19 20:52:00 -07:00
Owen Schwartz	143bb04f2f	New translations en-us.json (Italian) [ci skip]	2026-05-19 20:51:58 -07:00
Owen Schwartz	86ae02ec43	New translations en-us.json (German) [ci skip]	2026-05-19 20:51:57 -07:00
Owen Schwartz	f23aef0b7b	New translations en-us.json (Czech) [ci skip]	2026-05-19 20:51:55 -07:00
Owen Schwartz	d9796d785f	New translations en-us.json (Bulgarian) [ci skip]	2026-05-19 20:51:53 -07:00
Owen Schwartz	eda9a05818	New translations en-us.json (French) [ci skip]	2026-05-19 20:51:51 -07:00
Owen Schwartz	d07678e98e	New translations en-us.json (Spanish) [ci skip]	2026-05-16 20:56:46 -07:00
Owen Schwartz	99f30405cf	New translations en-us.json (Norwegian Bokmal) [ci skip]	2026-05-16 20:56:44 -07:00
Owen Schwartz	e1424579cd	New translations en-us.json (Chinese Simplified) [ci skip]	2026-05-16 20:56:42 -07:00
Owen Schwartz	3be1659520	New translations en-us.json (Turkish) [ci skip]	2026-05-16 20:56:41 -07:00
Owen Schwartz	84a8c6bcd5	New translations en-us.json (Russian) [ci skip]	2026-05-16 20:56:39 -07:00
Owen Schwartz	34ff615996	New translations en-us.json (Portuguese) [ci skip]	2026-05-16 20:56:37 -07:00
Owen Schwartz	ce9fb20034	New translations en-us.json (Polish) [ci skip]	2026-05-16 20:56:35 -07:00
Owen Schwartz	beb89f53be	New translations en-us.json (Dutch) [ci skip]	2026-05-16 20:56:34 -07:00
Owen Schwartz	e1bd0083e9	New translations en-us.json (Korean) [ci skip]	2026-05-16 20:56:32 -07:00
Owen Schwartz	7c86c95922	New translations en-us.json (Italian) [ci skip]	2026-05-16 20:56:31 -07:00
Owen Schwartz	6a8cc4c1fd	New translations en-us.json (German) [ci skip]	2026-05-16 20:56:29 -07:00
Owen Schwartz	8606114b7e	New translations en-us.json (Czech) [ci skip]	2026-05-16 20:56:27 -07:00
Owen Schwartz	01f9c9942d	New translations en-us.json (Bulgarian) [ci skip]	2026-05-16 20:56:26 -07:00
Owen Schwartz	95c2662065	New translations en-us.json (French) [ci skip]	2026-05-16 20:56:24 -07:00