Merge branch 'dev'

Dont create newt sites with exit node or subnet
Subscribed limits for domains is higher
2026-06-12 02:17:40 +00:00 · 2026-02-04 21:44:07 -08:00 · 2026-02-02 18:19:13 -08:00 · 2026-02-02 16:46:48 -08:00 · 2026-01-29 10:01:30 -08:00 · 2026-01-29 10:01:30 -08:00
54 changed files with 2020 additions and 1468 deletions
--- a/messages/de-DE.json
+++ b/messages/de-DE.json
@@ -97,7 +97,7 @@
    "siteGeneralDescription": "Allgemeine Einstellungen für diesen Standort konfigurieren",
    "siteSettingDescription": "Standorteinstellungen konfigurieren",
    "siteSetting": "{siteName} Einstellungen",
-    "siteNewtTunnel": "Neuer Standort (empfohlen)",
+    "siteNewtTunnel": "Newt Standort (empfohlen)",
    "siteNewtTunnelDescription": "Einfachster Weg, einen Einstiegspunkt in jedes Netzwerk zu erstellen. Keine zusätzliche Einrichtung.",
    "siteWg": "Einfacher WireGuard Tunnel",
    "siteWgDescription": "Verwende jeden WireGuard-Client, um einen Tunnel einzurichten. Manuelles NAT-Setup erforderlich.",
@@ -107,7 +107,7 @@
    "siteSeeAll": "Alle Standorte anzeigen",
    "siteTunnelDescription": "Legen Sie fest, wie Sie sich mit dem Standort verbinden möchten",
    "siteNewtCredentials": "Zugangsdaten",
-    "siteNewtCredentialsDescription": "So wird sich die Seite mit dem Server authentifizieren",
+    "siteNewtCredentialsDescription": "So wird sich der Standort mit dem Server authentifizieren",
    "remoteNodeCredentialsDescription": "So wird sich der entfernte Node mit dem Server authentifizieren",
    "siteCredentialsSave": "Anmeldedaten speichern",
    "siteCredentialsSaveDescription": "Du kannst das nur einmal sehen. Stelle sicher, dass du es an einen sicheren Ort kopierst.",
@@ -2503,7 +2503,7 @@
    "deviceModel": "Gerätemodell",
    "serialNumber": "Seriennummer",
    "hostname": "Hostname",
-    "firstSeen": "Erster Blick",
+    "firstSeen": "Zuerst gesehen",
    "lastSeen": "Zuletzt gesehen",
    "biometricsEnabled": "Biometrie aktiviert",
    "diskEncrypted": "Festplatte verschlüsselt",
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1404,10 +1404,10 @@
    "billingUsageLimitsOverview": "Usage Limits Overview",
    "billingMonitorUsage": "Monitor your usage against configured limits. If you need limits increased please contact us support@pangolin.net.",
    "billingDataUsage": "Data Usage",
-    "billingSites": "Sites",
-    "billingUsers": "Users",
-    "billingDomains": "Domains",
-    "billingRemoteExitNodes": "Remote Nodes",
+    "billingOnlineTime": "Site Online Time",
+    "billingUsers": "Active Users",
+    "billingDomains": "Active Domains",
+    "billingRemoteExitNodes": "Active Self-hosted Nodes",
    "billingNoLimitConfigured": "No limit configured",
    "billingEstimatedPeriod": "Estimated Billing Period",
    "billingIncludedUsage": "Included Usage",
@@ -1432,10 +1432,10 @@
    "billingFailedToGetPortalUrl": "Failed to get portal URL",
    "billingPortalError": "Portal Error",
    "billingDataUsageInfo": "You're charged for all data transferred through your secure tunnels when connected to the cloud. This includes both incoming and outgoing traffic across all your sites. When you reach your limit, your sites will disconnect until you upgrade your plan or reduce usage. Data is not charged when using nodes.",
-    "billingSInfo": "How many sites you can use",
-    "billingUsersInfo": "How many users you can use",
-    "billingDomainInfo": "How many domains you can use",
-    "billingRemoteExitNodesInfo": "How many remote nodes you can use",
+    "billingOnlineTimeInfo": "You're charged based on how long your sites stay connected to the cloud. For example, 44,640 minutes equals one site running 24/7 for a full month. When you reach your limit, your sites will disconnect until you upgrade your plan or reduce usage. Time is not charged when using nodes.",
+    "billingUsersInfo": "You're charged for each user in the organization. Billing is calculated daily based on the number of active user accounts in your org.",
+    "billingDomainInfo": "You're charged for each domain in the organization. Billing is calculated daily based on the number of active domain accounts in your org.",
+    "billingRemoteExitNodesInfo": "You're charged for each managed Node in the organization. Billing is calculated daily based on the number of active managed Nodes in your org.",
    "billingLicenseKeys": "License Keys",
    "billingLicenseKeysDescription": "Manage your license key subscriptions",
    "billingLicenseSubscription": "License Subscription",
@@ -1444,6 +1444,7 @@
    "billingQuantity": "Quantity",
    "billingTotal": "total",
    "billingModifyLicenses": "Modify License Subscription",
+    "billingPricingCalculatorLink": "View Pricing Calculator",
    "domainNotFound": "Domain Not Found",
    "domainNotFoundDescription": "This resource is disabled because the domain no longer exists our system. Please set a new domain for this resource.",
    "failed": "Failed",
@@ -1520,27 +1521,6 @@
    "resourcePortRequired": "Port number is required for non-HTTP resources",
    "resourcePortNotAllowed": "Port number should not be set for HTTP resources",
    "billingPricingCalculatorLink": "Pricing Calculator",
-    "billingYourPlan": "Your Plan",
-    "billingViewOrModifyPlan": "View or modify your current plan",
-    "billingViewPlanDetails": "View Plan Details",
-    "billingUsageAndLimits": "Usage and Limits",
-    "billingViewUsageAndLimits": "View your plan's limits and current usage",
-    "billingCurrentUsage": "Current Usage",
-    "billingMaximumLimits": "Maximum Limits",
-    "billingRemoteNodes": "Remote Nodes",
-    "billingUnlimited": "Unlimited",
-    "billingPaidLicenseKeys": "Paid License Keys",
-    "billingManageLicenseSubscription": "Manage your subscription for paid self-hosted license keys",
-    "billingCurrentKeys": "Current Keys",
-    "billingModifyCurrentPlan": "Modify Current Plan",
-    "billingConfirmUpgrade": "Confirm Upgrade",
-    "billingConfirmDowngrade": "Confirm Downgrade",
-    "billingConfirmUpgradeDescription": "You are about to upgrade your plan. Review the new limits and pricing below.",
-    "billingConfirmDowngradeDescription": "You are about to downgrade your plan. Review the new limits and pricing below.",
-    "billingPlanIncludes": "Plan Includes",
-    "billingProcessing": "Processing...",
-    "billingConfirmUpgradeButton": "Confirm Upgrade",
-    "billingConfirmDowngradeButton": "Confirm Downgrade",
    "signUpTerms": {
        "IAgreeToThe": "I agree to the",
        "termsOfService": "terms of service",
--- a/package.json
+++ b/package.json
@@ -14,8 +14,7 @@
        "dev": "NODE_ENV=development ENVIRONMENT=dev tsx watch server/index.ts",
        "dev:check": "npx tsc --noEmit && npm run format:check",
        "dev:setup": "cp config/config.example.yml config/config.yml && npm run set:oss && npm run set:sqlite && npm run db:generate && npm run db:sqlite:push",
-        "db:pg:generate": "drizzle-kit generate --config=./drizzle.pg.config.ts",
-        "db:sqlite:generate": "drizzle-kit generate --config=./drizzle.sqlite.config.ts",
+        "db:generate": "drizzle-kit generate --config=./drizzle.config.ts",
        "db:pg:push": "npx tsx server/db/pg/migrate.ts",
        "db:sqlite:push": "npx tsx server/db/sqlite/migrate.ts",
        "db:studio": "drizzle-kit studio --config=./drizzle.config.ts",
--- a/server/db/pg/schema/privateSchema.ts
+++ b/server/db/pg/schema/privateSchema.ts
@@ -82,8 +82,7 @@ export const subscriptions = pgTable("subscriptions", {
    canceledAt: bigint("canceledAt", { mode: "number" }),
    createdAt: bigint("createdAt", { mode: "number" }).notNull(),
    updatedAt: bigint("updatedAt", { mode: "number" }),
-    billingCycleAnchor: bigint("billingCycleAnchor", { mode: "number" }),
-    type: varchar("type", { length: 50 }) // home_lab, starter, scale, or license
+    billingCycleAnchor: bigint("billingCycleAnchor", { mode: "number" })
 });

 export const subscriptionItems = pgTable("subscriptionItems", {
--- a/server/db/sqlite/schema/privateSchema.ts
+++ b/server/db/sqlite/schema/privateSchema.ts
@@ -70,8 +70,7 @@ export const subscriptions = sqliteTable("subscriptions", {
    canceledAt: integer("canceledAt"),
    createdAt: integer("createdAt").notNull(),
    updatedAt: integer("updatedAt"),
-    billingCycleAnchor: integer("billingCycleAnchor"),
-    type: text("type") // home_lab, starter, scale, or license
+    billingCycleAnchor: integer("billingCycleAnchor")
 });

 export const subscriptionItems = sqliteTable("subscriptionItems", {
--- a/server/integrationApiServer.ts
+++ b/server/integrationApiServer.ts
@@ -105,13 +105,11 @@ function getOpenApiDocumentation() {
        servers: [{ url: "/v1" }]
    });

-    if (!process.env.DISABLE_GEN_OPENAPI) {
-        // convert to yaml and save to file
-        const outputPath = path.join(APP_PATH, "openapi.yaml");
-        const yamlOutput = yaml.dump(generated);
-        fs.writeFileSync(outputPath, yamlOutput, "utf8");
-        logger.info(`OpenAPI documentation saved to ${outputPath}`);
-    }
+    // convert to yaml and save to file
+    const outputPath = path.join(APP_PATH, "openapi.yaml");
+    const yamlOutput = yaml.dump(generated);
+    fs.writeFileSync(outputPath, yamlOutput, "utf8");
+    logger.info(`OpenAPI documentation saved to ${outputPath}`);

    return generated;
 }
--- a/server/lib/billing/features.ts
+++ b/server/lib/billing/features.ts
@@ -1,24 +1,30 @@
 import Stripe from "stripe";
-import { usageService } from "./usageService";

 export enum FeatureId {
+    SITE_UPTIME = "siteUptime",
    USERS = "users",
-    SITES = "sites",
    EGRESS_DATA_MB = "egressDataMb",
    DOMAINS = "domains",
-    REMOTE_EXIT_NODES = "remoteExitNodes",
-    HOME_LAB = "home_lab"
+    REMOTE_EXIT_NODES = "remoteExitNodes"
 }

-export const FeatureMeterIds: Partial<Record<FeatureId, string>> = { // right now we are not charging for any data
-    // [FeatureId.EGRESS_DATA_MB]: "mtr_61Srreh9eWrExDSCe41D3Ee2Ir7Wm5YW"
+export const FeatureMeterIds: Record<FeatureId, string> = {
+    [FeatureId.SITE_UPTIME]: "mtr_61Srrej5wUJuiTWgo41D3Ee2Ir7WmDLU",
+    [FeatureId.USERS]: "mtr_61SrreISyIWpwUNGR41D3Ee2Ir7WmQro",
+    [FeatureId.EGRESS_DATA_MB]: "mtr_61Srreh9eWrExDSCe41D3Ee2Ir7Wm5YW",
+    [FeatureId.DOMAINS]: "mtr_61Ss9nIKDNMw0LDRU41D3Ee2Ir7WmRPU",
+    [FeatureId.REMOTE_EXIT_NODES]: "mtr_61T86UXnfxTVXy9sD41D3Ee2Ir7WmFTE"
 };

-export const FeatureMeterIdsSandbox: Partial<Record<FeatureId, string>> = {
-    // [FeatureId.EGRESS_DATA_MB]: "mtr_test_61Snh2a2m6qome5Kv41DCpkOb237B3dQ"
+export const FeatureMeterIdsSandbox: Record<FeatureId, string> = {
+    [FeatureId.SITE_UPTIME]: "mtr_test_61Snh3cees4w60gv841DCpkOb237BDEu",
+    [FeatureId.USERS]: "mtr_test_61Sn5fLtq1gSfRkyA41DCpkOb237B6au",
+    [FeatureId.EGRESS_DATA_MB]: "mtr_test_61Snh2a2m6qome5Kv41DCpkOb237B3dQ",
+    [FeatureId.DOMAINS]: "mtr_test_61SsA8qrdAlgPpFRQ41DCpkOb237BGts",
+    [FeatureId.REMOTE_EXIT_NODES]: "mtr_test_61T86Vqmwa3D9ra3341DCpkOb237B94K"
 };

-export function getFeatureMeterId(featureId: FeatureId): string | undefined {
+export function getFeatureMeterId(featureId: FeatureId): string {
    if (
        process.env.ENVIRONMENT == "prod" &&
        process.env.SANDBOX_MODE !== "true"
@@ -37,83 +43,45 @@ export function getFeatureIdByMetricId(
    )?.[0];
 }

-export type FeaturePriceSet = Partial<Record<FeatureId, string>>;
-
-export const homeLabFeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.HOME_LAB]: "price_1SxgpPDCpkOb237Bfo4rIsoT"
+export type FeaturePriceSet = {
+    [key in Exclude<FeatureId, FeatureId.DOMAINS>]: string;
+} & {
+    [FeatureId.DOMAINS]?: string; // Optional since domains are not billed
 };

-export const homeLabFeaturePriceSetSandbox: FeaturePriceSet = {
-    [FeatureId.HOME_LAB]: "price_1SxgpPDCpkOb237Bfo4rIsoT"
+export const standardFeaturePriceSet: FeaturePriceSet = {
+    // Free tier matches the freeLimitSet
+    [FeatureId.SITE_UPTIME]: "price_1RrQc4D3Ee2Ir7WmaJGZ3MtF",
+    [FeatureId.USERS]: "price_1RrQeJD3Ee2Ir7WmgveP3xea",
+    [FeatureId.EGRESS_DATA_MB]: "price_1RrQXFD3Ee2Ir7WmvGDlgxQk",
+    // [FeatureId.DOMAINS]: "price_1Rz3tMD3Ee2Ir7Wm5qLeASzC",
+    [FeatureId.REMOTE_EXIT_NODES]: "price_1S46weD3Ee2Ir7Wm94KEHI4h"
 };

-export function getHomeLabFeaturePriceSet(): FeaturePriceSet {
+export const standardFeaturePriceSetSandbox: FeaturePriceSet = {
+    // Free tier matches the freeLimitSet
+    [FeatureId.SITE_UPTIME]: "price_1RefFBDCpkOb237BPrKZ8IEU",
+    [FeatureId.USERS]: "price_1ReNa4DCpkOb237Bc67G5muF",
+    [FeatureId.EGRESS_DATA_MB]: "price_1Rfp9LDCpkOb237BwuN5Oiu0",
+    // [FeatureId.DOMAINS]: "price_1Ryi88DCpkOb237B2D6DM80b",
+    [FeatureId.REMOTE_EXIT_NODES]: "price_1RyiZvDCpkOb237BXpmoIYJL"
+};
+
+export function getStandardFeaturePriceSet(): FeaturePriceSet {
    if (
        process.env.ENVIRONMENT == "prod" &&
        process.env.SANDBOX_MODE !== "true"
    ) {
-        return homeLabFeaturePriceSet;
+        return standardFeaturePriceSet;
    } else {
-        return homeLabFeaturePriceSetSandbox;
+        return standardFeaturePriceSetSandbox;
    }
 }

-export const starterFeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEHDCpkOb237BD9lBkPiR"
-};
-
-export const starterFeaturePriceSetSandbox: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEHDCpkOb237BD9lBkPiR"
-};
-
-export function getStarterFeaturePriceSet(): FeaturePriceSet {
-    if (
-        process.env.ENVIRONMENT == "prod" &&
-        process.env.SANDBOX_MODE !== "true"
-    ) {
-        return starterFeaturePriceSet;
-    } else {
-        return starterFeaturePriceSetSandbox;
-    }
-}
-
-export const scaleFeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEODCpkOb237BiXdCBSfs"
-};
-
-export const scaleFeaturePriceSetSandbox: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEODCpkOb237BiXdCBSfs"
-};
-
-export function getScaleFeaturePriceSet(): FeaturePriceSet {
-    if (
-        process.env.ENVIRONMENT == "prod" &&
-        process.env.SANDBOX_MODE !== "true"
-    ) {
-        return scaleFeaturePriceSet;
-    } else {
-        return scaleFeaturePriceSetSandbox;
-    }
-}
-
-export async function getLineItems(
-    featurePriceSet: FeaturePriceSet,
-    orgId: string,
-): Promise<Stripe.Checkout.SessionCreateParams.LineItem[]> {
-    const users = await usageService.getUsageDaily(orgId, FeatureId.USERS);
-
-    return Object.entries(featurePriceSet).map(([featureId, priceId]) => {
-        let quantity: number | undefined;
-
-        if (featureId === FeatureId.USERS) {
-            quantity = users?.instantaneousValue || 1;
-        } else if (featureId === FeatureId.HOME_LAB) {
-            quantity = 1;
-        }
-
-        return {
-            price: priceId,
-            quantity: quantity
-        };
-    });
+export function getLineItems(
+    featurePriceSet: FeaturePriceSet
+): Stripe.Checkout.SessionCreateParams.LineItem[] {
+    return Object.entries(featurePriceSet).map(([featureId, priceId]) => ({
+        price: priceId
+    }));
 }
--- a/server/lib/billing/limitSet.ts
+++ b/server/lib/billing/limitSet.ts
@@ -1,14 +1,14 @@
 import { FeatureId } from "./features";

-export type LimitSet = Partial<{
+export type LimitSet = {
    [key in FeatureId]: {
        value: number | null; // null indicates no limit
        description?: string;
    };
-}>;
+};

 export const sandboxLimitSet: LimitSet = {
-    [FeatureId.SITES]: { value: 1, description: "Sandbox limit" }, // 1 site up for 2 days
+    [FeatureId.SITE_UPTIME]: { value: 2880, description: "Sandbox limit" }, // 1 site up for 2 days
    [FeatureId.USERS]: { value: 1, description: "Sandbox limit" },
    [FeatureId.EGRESS_DATA_MB]: { value: 1000, description: "Sandbox limit" }, // 1 GB
    [FeatureId.DOMAINS]: { value: 0, description: "Sandbox limit" },
@@ -16,69 +16,35 @@ export const sandboxLimitSet: LimitSet = {
 };

 export const freeLimitSet: LimitSet = {
-    [FeatureId.SITES]: { value: 3, description: "Free tier limit" }, // 1 site up for 32 days
+    [FeatureId.SITE_UPTIME]: { value: 46080, description: "Free tier limit" }, // 1 site up for 32 days
    [FeatureId.USERS]: { value: 3, description: "Free tier limit" },
    [FeatureId.EGRESS_DATA_MB]: {
        value: 25000,
        description: "Free tier limit"
    }, // 25 GB
    [FeatureId.DOMAINS]: { value: 3, description: "Free tier limit" },
-    [FeatureId.REMOTE_EXIT_NODES]: { value: 0, description: "Free tier limit" }
+    [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Free tier limit" }
 };

-export const homeLabLimitSet: LimitSet = {
-    [FeatureId.SITES]: { value: 3, description: "Home lab limit" }, // 1 site up for 32 days
-    [FeatureId.USERS]: { value: 3, description: "Home lab limit" },
-    [FeatureId.EGRESS_DATA_MB]: {
-        value: 25000,
-        description: "Home lab limit"
-    }, // 25 GB
-    [FeatureId.DOMAINS]: { value: 3, description: "Home lab limit" },
-    [FeatureId.REMOTE_EXIT_NODES]: { value: 1, description: "Home lab limit" }
-};
-
-export const starterLimitSet: LimitSet = {
-    [FeatureId.SITES]: {
-        value: 10,
-        description: "Starter limit"
+export const subscribedLimitSet: LimitSet = {
+    [FeatureId.SITE_UPTIME]: {
+        value: 2232000,
+        description: "Contact us to increase soft limit."
    }, // 50 sites up for 31 days
    [FeatureId.USERS]: {
        value: 150,
-        description: "Starter limit"
+        description: "Contact us to increase soft limit."
    },
    [FeatureId.EGRESS_DATA_MB]: {
        value: 12000000,
-        description: "Starter limit"
+        description: "Contact us to increase soft limit."
    }, // 12000 GB
    [FeatureId.DOMAINS]: {
        value: 250,
-        description: "Starter limit"
+        description: "Contact us to increase soft limit."
    },
    [FeatureId.REMOTE_EXIT_NODES]: {
        value: 5,
-        description: "Starter limit"
-    }
-};
-
-export const scaleLimitSet: LimitSet = {
-    [FeatureId.SITES]: {
-        value: 10,
-        description: "Scale limit"
-    }, // 50 sites up for 31 days
-    [FeatureId.USERS]: {
-        value: 150,
-        description: "Scale limit"
-    },
-    [FeatureId.EGRESS_DATA_MB]: {
-        value: 12000000,
-        description: "Scale limit"
-    }, // 12000 GB
-    [FeatureId.DOMAINS]: {
-        value: 250,
-        description: "Scale limit"
-    },
-    [FeatureId.REMOTE_EXIT_NODES]: {
-        value: 5,
-        description: "Scale limit"
+        description: "Contact us to increase soft limit."
    }
 };
--- a/server/lib/billing/tiers.ts
+++ b/server/lib/billing/tiers.ts
@@ -0,0 +1,34 @@
+export enum TierId {
+    STANDARD = "standard"
+}
+
+export type TierPriceSet = {
+    [key in TierId]: string;
+};
+
+export const tierPriceSet: TierPriceSet = {
+    // Free tier matches the freeLimitSet
+    [TierId.STANDARD]: "price_1RrQ9cD3Ee2Ir7Wmqdy3KBa0"
+};
+
+export const tierPriceSetSandbox: TierPriceSet = {
+    // Free tier matches the freeLimitSet
+    // when matching tier the keys closer to 0 index are matched first so list the tiers in descending order of value
+    [TierId.STANDARD]: "price_1RrAYJDCpkOb237By2s1P32m"
+};
+
+export function getTierPriceSet(
+    environment?: string,
+    sandbox_mode?: boolean
+): TierPriceSet {
+    if (
+        (process.env.ENVIRONMENT == "prod" &&
+            process.env.SANDBOX_MODE !== "true") ||
+        (environment === "prod" && sandbox_mode !== true)
+    ) {
+        // THIS GETS LOADED CLIENT SIDE AND SERVER SIDE
+        return tierPriceSet;
+    } else {
+        return tierPriceSetSandbox;
+    }
+}
--- a/server/lib/billing/usageService.ts
+++ b/server/lib/billing/usageService.ts
@@ -1,6 +1,8 @@
 import { eq, sql, and } from "drizzle-orm";
 import { v4 as uuidv4 } from "uuid";
 import { PutObjectCommand } from "@aws-sdk/client-s3";
+import * as fs from "fs/promises";
+import * as path from "path";
 import {
    db,
    usage,
@@ -31,7 +33,9 @@ interface StripeEvent {

 export function noop() {
    if (
-        build !== "saas"
+        build !== "saas" ||
+        !process.env.S3_BUCKET ||
+        !process.env.LOCAL_FILE_PATH
    ) {
        return true;
    }
@@ -40,37 +44,31 @@ export function noop() {

 export class UsageService {
    private bucketName: string | undefined;
-    private events: StripeEvent[] = [];
-    private lastUploadTime: number = Date.now();
-    private isUploading: boolean = false;
+    private currentEventFile: string | null = null;
+    private currentFileStartTime: number = 0;
+    private eventsDir: string | undefined;
+    private uploadingFiles: Set<string> = new Set();

    constructor() {
        if (noop()) {
            return;
        }
+        // this.bucketName = privateConfig.getRawPrivateConfig().stripe?.s3Bucket;
+        // this.eventsDir = privateConfig.getRawPrivateConfig().stripe?.localFilePath;
        this.bucketName = process.env.S3_BUCKET || undefined;
+        this.eventsDir = process.env.LOCAL_FILE_PATH || undefined;

-        // Periodically check and upload events
+        // Ensure events directory exists
+        this.initializeEventsDirectory().then(() => {
+            this.uploadPendingEventFilesOnStartup();
+        });
+
+        // Periodically check for old event files to upload
        setInterval(() => {
-            this.checkAndUploadEvents().catch((err) => {
-                logger.error("Error in periodic event upload:", err);
+            this.uploadOldEventFiles().catch((err) => {
+                logger.error("Error in periodic event file upload:", err);
            });
        }, 30000); // every 30 seconds
-
-        // Handle graceful shutdown on SIGTERM
-        process.on("SIGTERM", async () => {
-            logger.info("SIGTERM received, uploading events before shutdown...");
-            await this.forceUpload();
-            logger.info("Events uploaded, proceeding with shutdown");
-        });
-
-        // Handle SIGINT as well (Ctrl+C)
-        process.on("SIGINT", async () => {
-            logger.info("SIGINT received, uploading events before shutdown...");
-            await this.forceUpload();
-            logger.info("Events uploaded, proceeding with shutdown");
-            process.exit(0);
-        });
    }

    /**
@@ -80,6 +78,85 @@ export class UsageService {
        return Math.round(value * 100000000000) / 100000000000; // 11 decimal places
    }

+    private async initializeEventsDirectory(): Promise<void> {
+        if (!this.eventsDir) {
+            logger.warn(
+                "Stripe local file path is not configured, skipping events directory initialization."
+            );
+            return;
+        }
+        try {
+            await fs.mkdir(this.eventsDir, { recursive: true });
+        } catch (error) {
+            logger.error("Failed to create events directory:", error);
+        }
+    }
+
+    private async uploadPendingEventFilesOnStartup(): Promise<void> {
+        if (!this.eventsDir || !this.bucketName) {
+            logger.warn(
+                "Stripe local file path or bucket name is not configured, skipping leftover event file upload."
+            );
+            return;
+        }
+        try {
+            const files = await fs.readdir(this.eventsDir);
+            for (const file of files) {
+                if (file.endsWith(".json")) {
+                    const filePath = path.join(this.eventsDir, file);
+                    try {
+                        const fileContent = await fs.readFile(
+                            filePath,
+                            "utf-8"
+                        );
+                        const events = JSON.parse(fileContent);
+                        if (Array.isArray(events) && events.length > 0) {
+                            // Upload to S3
+                            const uploadCommand = new PutObjectCommand({
+                                Bucket: this.bucketName,
+                                Key: file,
+                                Body: fileContent,
+                                ContentType: "application/json"
+                            });
+                            await s3Client.send(uploadCommand);
+
+                            // Check if file still exists before unlinking
+                            try {
+                                await fs.access(filePath);
+                                await fs.unlink(filePath);
+                            } catch (unlinkError) {
+                                logger.debug(
+                                    `Startup file ${file} was already deleted`
+                                );
+                            }
+
+                            logger.info(
+                                `Uploaded leftover event file ${file} to S3 with ${events.length} events`
+                            );
+                        } else {
+                            // Remove empty file
+                            try {
+                                await fs.access(filePath);
+                                await fs.unlink(filePath);
+                            } catch (unlinkError) {
+                                logger.debug(
+                                    `Empty startup file ${file} was already deleted`
+                                );
+                            }
+                        }
+                    } catch (err) {
+                        logger.error(
+                            `Error processing leftover event file ${file}:`,
+                            err
+                        );
+                    }
+                }
+            }
+        } catch (error) {
+            logger.error("Failed to scan for leftover event files");
+        }
+    }
+
    public async add(
        orgId: string,
        featureId: FeatureId,
@@ -373,58 +450,121 @@ export class UsageService {
            }
        };

-        this.addEventToMemory(event);
-        await this.checkAndUploadEvents();
+        await this.writeEventToFile(event);
+        await this.checkAndUploadFile();
    }

-    private addEventToMemory(event: StripeEvent): void {
-        if (!this.bucketName) {
+    private async writeEventToFile(event: StripeEvent): Promise<void> {
+        if (!this.eventsDir || !this.bucketName) {
            logger.warn(
-                "S3 bucket name is not configured, skipping event storage."
+                "Stripe local file path or bucket name is not configured, skipping event file write."
            );
            return;
        }
-        this.events.push(event);
-    }
-
-    private async checkAndUploadEvents(): Promise<void> {
-        const now = Date.now();
-        const timeSinceLastUpload = now - this.lastUploadTime;
-
-        // Check if at least 1 minute has passed since last upload
-        if (timeSinceLastUpload >= 60000 && this.events.length > 0) {
-            await this.uploadEventsToS3();
-        }
-    }
-
-    private async uploadEventsToS3(): Promise<void> {
-        if (!this.bucketName) {
-            logger.warn(
-                "S3 bucket name is not configured, skipping S3 upload."
-            );
-            return;
+        if (!this.currentEventFile) {
+            this.currentEventFile = this.generateEventFileName();
+            this.currentFileStartTime = Date.now();
        }

-        if (this.events.length === 0) {
-            return;
-        }
-
-        // Check if already uploading
-        if (this.isUploading) {
-            logger.debug("Already uploading events, skipping");
-            return;
-        }
-
-        this.isUploading = true;
+        const filePath = path.join(this.eventsDir, this.currentEventFile);

        try {
-            // Take a snapshot of current events and clear the array
-            const eventsToUpload = [...this.events];
-            this.events = [];
-            this.lastUploadTime = Date.now();
+            let events: StripeEvent[] = [];

-            const fileName = this.generateEventFileName();
-            const fileContent = JSON.stringify(eventsToUpload, null, 2);
+            // Try to read existing file
+            try {
+                const fileContent = await fs.readFile(filePath, "utf-8");
+                events = JSON.parse(fileContent);
+            } catch (error) {
+                // File doesn't exist or is empty, start with empty array
+                events = [];
+            }
+
+            // Add new event
+            events.push(event);
+
+            // Write back to file
+            await fs.writeFile(filePath, JSON.stringify(events, null, 2));
+        } catch (error) {
+            logger.error("Failed to write event to file:", error);
+        }
+    }
+
+    private async checkAndUploadFile(): Promise<void> {
+        if (!this.currentEventFile) {
+            return;
+        }
+
+        const now = Date.now();
+        const fileAge = now - this.currentFileStartTime;
+
+        // Check if file is at least 1 minute old
+        if (fileAge >= 60000) {
+            // 60 seconds
+            await this.uploadFileToS3();
+        }
+    }
+
+    private async uploadFileToS3(): Promise<void> {
+        if (!this.bucketName || !this.eventsDir) {
+            logger.warn(
+                "Stripe local file path or bucket name is not configured, skipping S3 upload."
+            );
+            return;
+        }
+        if (!this.currentEventFile) {
+            return;
+        }
+
+        const fileName = this.currentEventFile;
+        const filePath = path.join(this.eventsDir, fileName);
+
+        // Check if this file is already being uploaded
+        if (this.uploadingFiles.has(fileName)) {
+            logger.debug(
+                `File ${fileName} is already being uploaded, skipping`
+            );
+            return;
+        }
+
+        // Mark file as being uploaded
+        this.uploadingFiles.add(fileName);
+
+        try {
+            // Check if file exists before trying to read it
+            try {
+                await fs.access(filePath);
+            } catch (error) {
+                logger.debug(
+                    `File ${fileName} does not exist, may have been already processed`
+                );
+                this.uploadingFiles.delete(fileName);
+                // Reset current file if it was this file
+                if (this.currentEventFile === fileName) {
+                    this.currentEventFile = null;
+                    this.currentFileStartTime = 0;
+                }
+                return;
+            }
+
+            // Check if file exists and has content
+            const fileContent = await fs.readFile(filePath, "utf-8");
+            const events = JSON.parse(fileContent);
+
+            if (events.length === 0) {
+                // No events to upload, just clean up
+                try {
+                    await fs.unlink(filePath);
+                } catch (unlinkError) {
+                    // File may have been already deleted
+                    logger.debug(
+                        `File ${fileName} was already deleted during cleanup`
+                    );
+                }
+                this.currentEventFile = null;
+                this.uploadingFiles.delete(fileName);
+                return;
+            }

            // Upload to S3
            const uploadCommand = new PutObjectCommand({
@@ -436,15 +576,29 @@ export class UsageService {

            await s3Client.send(uploadCommand);

+            // Clean up local file - check if it still exists before unlinking
+            try {
+                await fs.access(filePath);
+                await fs.unlink(filePath);
+            } catch (unlinkError) {
+                // File may have been already deleted by another process
+                logger.debug(
+                    `File ${fileName} was already deleted during upload`
+                );
+            }
+
            logger.info(
-                `Uploaded ${fileName} to S3 with ${eventsToUpload.length} events`
+                `Uploaded ${fileName} to S3 with ${events.length} events`
            );
+
+            // Reset for next file
+            this.currentEventFile = null;
+            this.currentFileStartTime = 0;
        } catch (error) {
-            logger.error("Failed to upload events to S3:", error);
-            // Note: Events are lost if upload fails. In a production system,
-            // you might want to add the events back to the array or implement retry logic
+            logger.error(`Failed to upload ${fileName} to S3:`, error);
        } finally {
-            this.isUploading = false;
+            // Always remove from uploading set
+            this.uploadingFiles.delete(fileName);
        }
    }

@@ -541,10 +695,111 @@ export class UsageService {
    }

    public async forceUpload(): Promise<void> {
-        if (this.events.length > 0) {
-            // Force upload regardless of time
-            this.lastUploadTime = 0; // Reset to force upload
-            await this.uploadEventsToS3();
+        await this.uploadFileToS3();
+    }
+
+    /**
+     * Scan the events directory for files older than 1 minute and upload them if not empty.
+     */
+    private async uploadOldEventFiles(): Promise<void> {
+        if (!this.eventsDir || !this.bucketName) {
+            logger.warn(
+                "Stripe local file path or bucket name is not configured, skipping old event file upload."
+            );
+            return;
+        }
+        try {
+            const files = await fs.readdir(this.eventsDir);
+            const now = Date.now();
+            for (const file of files) {
+                if (!file.endsWith(".json")) continue;
+
+                // Skip files that are already being uploaded
+                if (this.uploadingFiles.has(file)) {
+                    logger.debug(
+                        `Skipping file ${file} as it's already being uploaded`
+                    );
+                    continue;
+                }
+
+                const filePath = path.join(this.eventsDir, file);
+
+                try {
+                    // Check if file still exists before processing
+                    try {
+                        await fs.access(filePath);
+                    } catch (accessError) {
+                        logger.debug(`File ${file} does not exist, skipping`);
+                        continue;
+                    }
+
+                    const stat = await fs.stat(filePath);
+                    const age = now - stat.mtimeMs;
+                    if (age >= 90000) {
+                        // 1.5 minutes - Mark as being uploaded
+                        this.uploadingFiles.add(file);
+
+                        try {
+                            const fileContent = await fs.readFile(
+                                filePath,
+                                "utf-8"
+                            );
+                            const events = JSON.parse(fileContent);
+                            if (Array.isArray(events) && events.length > 0) {
+                                // Upload to S3
+                                const uploadCommand = new PutObjectCommand({
+                                    Bucket: this.bucketName,
+                                    Key: file,
+                                    Body: fileContent,
+                                    ContentType: "application/json"
+                                });
+                                await s3Client.send(uploadCommand);
+
+                                // Check if file still exists before unlinking
+                                try {
+                                    await fs.access(filePath);
+                                    await fs.unlink(filePath);
+                                } catch (unlinkError) {
+                                    logger.debug(
+                                        `File ${file} was already deleted during interval upload`
+                                    );
+                                }
+
+                                logger.info(
+                                    `Interval: Uploaded event file ${file} to S3 with ${events.length} events`
+                                );
+                                // If this was the current event file, reset it
+                                if (this.currentEventFile === file) {
+                                    this.currentEventFile = null;
+                                    this.currentFileStartTime = 0;
+                                }
+                            } else {
+                                // Remove empty file
+                                try {
+                                    await fs.access(filePath);
+                                    await fs.unlink(filePath);
+                                } catch (unlinkError) {
+                                    logger.debug(
+                                        `Empty file ${file} was already deleted`
+                                    );
+                                }
+                            }
+                        } finally {
+                            // Always remove from uploading set
+                            this.uploadingFiles.delete(file);
+                        }
+                    }
+                } catch (err) {
+                    logger.error(
+                        `Interval: Error processing event file ${file}:`,
+                        err
+                    );
+                    // Remove from uploading set on error
+                    this.uploadingFiles.delete(file);
+                }
+            }
+        } catch (err) {
+            logger.error("Interval: Failed to scan for event files:", err);
        }
    }

--- a/server/lib/isSubscribed.ts
+++ b/server/lib/isSubscribed.ts
@@ -1,3 +0,0 @@
-export async function isSubscribed(orgId: string): Promise<boolean> {
-    return false;
-}
--- a/server/private/lib/billing/getOrgTierData.ts
+++ b/server/private/lib/billing/getOrgTierData.ts
@@ -11,58 +11,46 @@
 * This file is not licensed under the AGPLv3.
 */

+import { getTierPriceSet } from "@server/lib/billing/tiers";
+import { getOrgSubscriptionsData } from "@server/private/routers/billing/getOrgSubscriptions";
 import { build } from "@server/build";
-import { db, customers, subscriptions } from "@server/db";
-import { eq, and, ne } from "drizzle-orm";

 export async function getOrgTierData(
    orgId: string
-): Promise<{ tier: "home_lab" | "starter" | "scale" | null; active: boolean }> {
-    let tier: "home_lab" | "starter" | "scale" | null = null;
+): Promise<{ tier: string | null; active: boolean }> {
+    let tier = null;
    let active = false;

    if (build !== "saas") {
        return { tier, active };
    }

-    try {
-        // Get customer for org
-        const [customer] = await db
-            .select()
-            .from(customers)
-            .where(eq(customers.orgId, orgId))
-            .limit(1);
+    // TODO: THIS IS INEFFICIENT!!! WE SHOULD IMPROVE HOW WE STORE TIERS WITH SUBSCRIPTIONS AND RETRIEVE THEM

-        if (customer) {
-            // Query for active subscriptions that are not license type
-            const [subscription] = await db
-                .select()
-                .from(subscriptions)
-                .where(
-                    and(
-                        eq(subscriptions.customerId, customer.customerId),
-                        eq(subscriptions.status, "active"),
-                        ne(subscriptions.type, "license")
-                    )
-                )
-                .limit(1);
+    const subscriptionsWithItems = await getOrgSubscriptionsData(orgId);

-            if (subscription) {
-                // Validate that subscription.type is one of the expected tier values
-                if (
-                    subscription.type === "home_lab" ||
-                    subscription.type === "starter" ||
-                    subscription.type === "scale"
-                ) {
-                    tier = subscription.type;
-                    active = true;
+    for (const { subscription, items } of subscriptionsWithItems) {
+        if (items && items.length > 0) {
+            const tierPriceSet = getTierPriceSet();
+            // Iterate through tiers in order (earlier keys are higher tiers)
+            for (const [tierId, priceId] of Object.entries(tierPriceSet)) {
+                // Check if any subscription item matches this tier's price ID
+                const matchingItem = items.find((item) => item.priceId === priceId);
+                if (matchingItem) {
+                    tier = tierId;
+                    break;
                }
            }
        }
-    } catch (error) {
-        // If org not found or error occurs, return null tier and inactive
-        // This is acceptable behavior as per the function signature
-    }

+        if (subscription && subscription.status === "active") {
+            active = true;
+        }
+
+        // If we found a tier and active subscription, we can stop
+        if (tier && active) {
+            break;
+        }
+    }
    return { tier, active };
 }
--- a/server/private/lib/checkOrgAccessPolicy.ts
+++ b/server/private/lib/checkOrgAccessPolicy.ts
@@ -13,6 +13,8 @@

 import { build } from "@server/build";
 import { db, Org, orgs, ResourceSession, sessions, users } from "@server/db";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import license from "#private/license/license";
 import { eq } from "drizzle-orm";
 import {
--- a/server/private/lib/config.ts
+++ b/server/private/lib/config.ts
@@ -128,7 +128,10 @@ export class PrivateConfig {
        if (this.rawPrivateConfig.stripe?.s3Bucket) {
            process.env.S3_BUCKET = this.rawPrivateConfig.stripe.s3Bucket;
        }
-
+        if (this.rawPrivateConfig.stripe?.localFilePath) {
+            process.env.LOCAL_FILE_PATH =
+                this.rawPrivateConfig.stripe.localFilePath;
+        }
        if (this.rawPrivateConfig.stripe?.s3Region) {
            process.env.S3_REGION = this.rawPrivateConfig.stripe.s3Region;
        }
--- a/server/private/lib/isLicencedOrSubscribed.ts
+++ b/server/private/lib/isLicencedOrSubscribed.ts
@@ -14,6 +14,7 @@
 import { build } from "@server/build";
 import license from "#private/license/license";
 import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";

 export async function isLicensedOrSubscribed(orgId: string): Promise<boolean> {
    if (build === "enterprise") {
@@ -21,9 +22,9 @@ export async function isLicensedOrSubscribed(orgId: string): Promise<boolean> {
    }

    if (build === "saas") {
-        const { tier, active } = await getOrgTierData(orgId);
-        return (tier == "home_lab" || tier == "starter" || tier == "scale") && active;
+        const { tier } = await getOrgTierData(orgId);
+        return tier === TierId.STANDARD;
    }

    return false;
-}
+}
--- a/server/private/lib/isSubscribed.ts
+++ b/server/private/lib/isSubscribed.ts
@@ -1,24 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 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 { build } from "@server/build";
-import { getOrgTierData } from "#private/lib/billing";
-
-export async function isSubscribed(orgId: string): Promise<boolean> {
-    if (build === "saas") {
-        const { tier, active } = await getOrgTierData(orgId);
-        return (tier == "home_lab" || tier == "starter" || tier == "scale") && active;
-    }
-
-    return false;
-}
--- a/server/private/lib/readConfigFile.ts
+++ b/server/private/lib/readConfigFile.ts
@@ -178,7 +178,7 @@ export const privateConfigSchema = z.object({
                .transform(getEnvOrYaml("STRIPE_WEBHOOK_SECRET")),
            s3Bucket: z.string(),
            s3Region: z.string().default("us-east-1"),
-            localFilePath: z.string().optional()
+            localFilePath: z.string()
        })
        .optional()
 });
--- a/server/private/middlewares/verifySubscription.ts
+++ b/server/private/middlewares/verifySubscription.ts
@@ -38,8 +38,9 @@ export async function verifyValidSubscription(
            );
        }

-        const { tier, active  } = await getOrgTierData(orgId);
-        if ((tier == "home_lab" || tier == "starter" || tier == "scale") && active) {
+        const tier = await getOrgTierData(orgId);
+
+        if (!tier.active) {
            return next(
                createHttpError(
                    HttpCode.FORBIDDEN,
--- a/server/private/routers/approvals/listApprovals.ts
+++ b/server/private/routers/approvals/listApprovals.ts
@@ -19,6 +19,8 @@ import { fromError } from "zod-validation-error";

 import type { Request, Response, NextFunction } from "express";
 import { build } from "@server/build";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import {
    approvals,
    clients,
@@ -219,6 +221,19 @@ export async function listApprovals(

        const { orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        const approvalsList = await queryApprovals(
            orgId.toString(),
            limit,
--- a/server/private/routers/approvals/processPendingApproval.ts
+++ b/server/private/routers/approvals/processPendingApproval.ts
@@ -17,7 +17,10 @@ import createHttpError from "http-errors";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";

+import { build } from "@server/build";
 import { approvals, clients, db, orgs, type Approval } from "@server/db";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import response from "@server/lib/response";
 import { and, eq, type InferInsertModel } from "drizzle-orm";
 import type { NextFunction, Request, Response } from "express";
@@ -61,6 +64,20 @@ export async function processPendingApproval(
        }

        const { orgId, approvalId } = parsedParams.data;
+
+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        const updateData = parsedBody.data;

        const approval = await db
--- a/server/private/routers/auth/index.ts
+++ b/server/private/routers/auth/index.ts
@@ -13,3 +13,4 @@

 export * from "./transferSession";
 export * from "./getSessionTransferToken";
+export * from "./quickStart";
--- a/server/private/routers/auth/quickStart.ts
+++ b/server/private/routers/auth/quickStart.ts
@@ -0,0 +1,585 @@
+/*
+ * This file is part of a proprietary work.
+ *
+ * Copyright (c) 2025 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 { NextFunction, Request, Response } from "express";
+import {
+    account,
+    db,
+    domainNamespaces,
+    domains,
+    exitNodes,
+    newts,
+    newtSessions,
+    orgs,
+    passwordResetTokens,
+    Resource,
+    resourcePassword,
+    resourcePincode,
+    resources,
+    resourceWhitelist,
+    roleResources,
+    roles,
+    roleSites,
+    sites,
+    targetHealthCheck,
+    targets,
+    userResources,
+    userSites
+} from "@server/db";
+import HttpCode from "@server/types/HttpCode";
+import { z } from "zod";
+import { users } from "@server/db";
+import { fromError } from "zod-validation-error";
+import createHttpError from "http-errors";
+import response from "@server/lib/response";
+import { SqliteError } from "better-sqlite3";
+import { eq, and, sql } from "drizzle-orm";
+import moment from "moment";
+import { generateId } from "@server/auth/sessions/app";
+import config from "@server/lib/config";
+import logger from "@server/logger";
+import { hashPassword } from "@server/auth/password";
+import { UserType } from "@server/types/UserTypes";
+import { createUserAccountOrg } from "@server/lib/createUserAccountOrg";
+import { sendEmail } from "@server/emails";
+import WelcomeQuickStart from "@server/emails/templates/WelcomeQuickStart";
+import { alphabet, generateRandomString } from "oslo/crypto";
+import { createDate, TimeSpan } from "oslo";
+import { getUniqueResourceName, getUniqueSiteName } from "@server/db/names";
+import { pickPort } from "@server/routers/target/helpers";
+import { addTargets } from "@server/routers/newt/targets";
+import { isTargetValid } from "@server/lib/validators";
+import { listExitNodes } from "#private/lib/exitNodes";
+
+const bodySchema = z.object({
+    email: z.email().toLowerCase(),
+    ip: z.string().refine(isTargetValid),
+    method: z.enum(["http", "https"]),
+    port: z.int().min(1).max(65535),
+    pincode: z
+        .string()
+        .regex(/^\d{6}$/)
+        .optional(),
+    password: z.string().min(4).max(100).optional(),
+    enableWhitelist: z.boolean().optional().default(true),
+    animalId: z.string() // This is actually the secret key for the backend
+});
+
+export type QuickStartBody = z.infer<typeof bodySchema>;
+
+export type QuickStartResponse = {
+    newtId: string;
+    newtSecret: string;
+    resourceUrl: string;
+    completeSignUpLink: string;
+};
+
+const DEMO_UBO_KEY = "b460293f-347c-4b30-837d-4e06a04d5a22";
+
+export async function quickStart(
+    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 {
+        email,
+        ip,
+        method,
+        port,
+        pincode,
+        password,
+        enableWhitelist,
+        animalId
+    } = parsedBody.data;
+
+    try {
+        const tokenValidation = validateTokenOnApi(animalId);
+
+        if (!tokenValidation.isValid) {
+            logger.warn(
+                `Quick start failed for ${email} token ${animalId}: ${tokenValidation.message}`
+            );
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Invalid or expired token"
+                )
+            );
+        }
+
+        if (animalId === DEMO_UBO_KEY) {
+            if (email !== "mehrdad@getubo.com") {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Invalid email for demo Ubo key"
+                    )
+                );
+            }
+
+            const [existing] = await db
+                .select()
+                .from(users)
+                .where(
+                    and(
+                        eq(users.email, email),
+                        eq(users.type, UserType.Internal)
+                    )
+                );
+
+            if (existing) {
+                // delete the user if it already exists
+                await db.delete(users).where(eq(users.userId, existing.userId));
+                const orgId = `org_${existing.userId}`;
+                await db.delete(orgs).where(eq(orgs.orgId, orgId));
+            }
+        }
+
+        const tempPassword = generateId(15);
+        const passwordHash = await hashPassword(tempPassword);
+        const userId = generateId(15);
+
+        // TODO: see if that user already exists?
+
+        // Create the sandbox user
+        const existing = await db
+            .select()
+            .from(users)
+            .where(
+                and(eq(users.email, email), eq(users.type, UserType.Internal))
+            );
+
+        if (existing && existing.length > 0) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "A user with that email address already exists"
+                )
+            );
+        }
+
+        let newtId: string;
+        let secret: string;
+        let fullDomain: string;
+        let resource: Resource;
+        let completeSignUpLink: string;
+
+        await db.transaction(async (trx) => {
+            await trx.insert(users).values({
+                userId: userId,
+                type: UserType.Internal,
+                username: email,
+                email: email,
+                passwordHash,
+                dateCreated: moment().toISOString()
+            });
+
+            // create user"s account
+            await trx.insert(account).values({
+                userId
+            });
+        });
+
+        const { success, error, org } = await createUserAccountOrg(
+            userId,
+            email
+        );
+        if (!success) {
+            if (error) {
+                throw new Error(error);
+            }
+            throw new Error("Failed to create user account and organization");
+        }
+        if (!org) {
+            throw new Error("Failed to create user account and organization");
+        }
+
+        const orgId = org.orgId;
+
+        await db.transaction(async (trx) => {
+            const token = generateRandomString(
+                8,
+                alphabet("0-9", "A-Z", "a-z")
+            );
+
+            await trx
+                .delete(passwordResetTokens)
+                .where(eq(passwordResetTokens.userId, userId));
+
+            const tokenHash = await hashPassword(token);
+
+            await trx.insert(passwordResetTokens).values({
+                userId: userId,
+                email: email,
+                tokenHash,
+                expiresAt: createDate(new TimeSpan(7, "d")).getTime()
+            });
+
+            // // Create the sandbox newt
+            // const newClientAddress = await getNextAvailableClientSubnet(orgId);
+            // if (!newClientAddress) {
+            //     throw new Error("No available subnet found");
+            // }
+
+            // const clientAddress = newClientAddress.split("/")[0];
+
+            newtId = generateId(15);
+            secret = generateId(48);
+
+            // Create the sandbox site
+            const siteNiceId = await getUniqueSiteName(orgId);
+            const siteName = `First Site`;
+
+            // pick a random exit node
+            const exitNodesList = await listExitNodes(orgId);
+
+            // select a random exit node
+            const randomExitNode =
+                exitNodesList[Math.floor(Math.random() * exitNodesList.length)];
+
+            if (!randomExitNode) {
+                throw new Error("No exit nodes available");
+            }
+
+            const [newSite] = await trx
+                .insert(sites)
+                .values({
+                    orgId,
+                    exitNodeId: randomExitNode.exitNodeId,
+                    name: siteName,
+                    niceId: siteNiceId,
+                    // address: clientAddress,
+                    type: "newt",
+                    dockerSocketEnabled: true
+                })
+                .returning();
+
+            const siteId = newSite.siteId;
+
+            const adminRole = await trx
+                .select()
+                .from(roles)
+                .where(and(eq(roles.isAdmin, true), eq(roles.orgId, orgId)))
+                .limit(1);
+
+            if (adminRole.length === 0) {
+                throw new Error("Admin role not found");
+            }
+
+            await trx.insert(roleSites).values({
+                roleId: adminRole[0].roleId,
+                siteId: newSite.siteId
+            });
+
+            if (req.user && req.userOrgRoleId != adminRole[0].roleId) {
+                // make sure the user can access the site
+                await trx.insert(userSites).values({
+                    userId: req.user?.userId!,
+                    siteId: newSite.siteId
+                });
+            }
+
+            // add the peer to the exit node
+            const secretHash = await hashPassword(secret!);
+
+            await trx.insert(newts).values({
+                newtId: newtId!,
+                secretHash,
+                siteId: newSite.siteId,
+                dateCreated: moment().toISOString()
+            });
+
+            const [randomNamespace] = await trx
+                .select()
+                .from(domainNamespaces)
+                .orderBy(sql`RANDOM()`)
+                .limit(1);
+
+            if (!randomNamespace) {
+                throw new Error("No domain namespace available");
+            }
+
+            const [randomNamespaceDomain] = await trx
+                .select()
+                .from(domains)
+                .where(eq(domains.domainId, randomNamespace.domainId))
+                .limit(1);
+
+            if (!randomNamespaceDomain) {
+                throw new Error("No domain found for the namespace");
+            }
+
+            const resourceNiceId = await getUniqueResourceName(orgId);
+
+            // Create sandbox resource
+            const subdomain = `${resourceNiceId}-${generateId(5)}`;
+            fullDomain = `${subdomain}.${randomNamespaceDomain.baseDomain}`;
+
+            const resourceName = `First Resource`;
+
+            const newResource = await trx
+                .insert(resources)
+                .values({
+                    niceId: resourceNiceId,
+                    fullDomain,
+                    domainId: randomNamespaceDomain.domainId,
+                    orgId,
+                    name: resourceName,
+                    subdomain,
+                    http: true,
+                    protocol: "tcp",
+                    ssl: true,
+                    sso: false,
+                    emailWhitelistEnabled: enableWhitelist
+                })
+                .returning();
+
+            await trx.insert(roleResources).values({
+                roleId: adminRole[0].roleId,
+                resourceId: newResource[0].resourceId
+            });
+
+            if (req.user && req.userOrgRoleId != adminRole[0].roleId) {
+                // make sure the user can access the resource
+                await trx.insert(userResources).values({
+                    userId: req.user?.userId!,
+                    resourceId: newResource[0].resourceId
+                });
+            }
+
+            resource = newResource[0];
+
+            // Create the sandbox target
+            const { internalPort, targetIps } = await pickPort(siteId!, trx);
+
+            if (!internalPort) {
+                throw new Error("No available internal port");
+            }
+
+            const newTarget = await trx
+                .insert(targets)
+                .values({
+                    resourceId: resource.resourceId,
+                    siteId: siteId!,
+                    internalPort,
+                    ip,
+                    method,
+                    port,
+                    enabled: true
+                })
+                .returning();
+
+            const newHealthcheck = await trx
+                .insert(targetHealthCheck)
+                .values({
+                    targetId: newTarget[0].targetId,
+                    hcEnabled: false
+                })
+                .returning();
+
+            // add the new target to the targetIps array
+            targetIps.push(`${ip}/32`);
+
+            const [newt] = await trx
+                .select()
+                .from(newts)
+                .where(eq(newts.siteId, siteId!))
+                .limit(1);
+
+            await addTargets(
+                newt.newtId,
+                newTarget,
+                newHealthcheck,
+                resource.protocol
+            );
+
+            // Set resource pincode if provided
+            if (pincode) {
+                await trx
+                    .delete(resourcePincode)
+                    .where(
+                        eq(resourcePincode.resourceId, resource!.resourceId)
+                    );
+
+                const pincodeHash = await hashPassword(pincode);
+
+                await trx.insert(resourcePincode).values({
+                    resourceId: resource!.resourceId,
+                    pincodeHash,
+                    digitLength: 6
+                });
+            }
+
+            // Set resource password if provided
+            if (password) {
+                await trx
+                    .delete(resourcePassword)
+                    .where(
+                        eq(resourcePassword.resourceId, resource!.resourceId)
+                    );
+
+                const passwordHash = await hashPassword(password);
+
+                await trx.insert(resourcePassword).values({
+                    resourceId: resource!.resourceId,
+                    passwordHash
+                });
+            }
+
+            // Set resource OTP if whitelist is enabled
+            if (enableWhitelist) {
+                await trx.insert(resourceWhitelist).values({
+                    email,
+                    resourceId: resource!.resourceId
+                });
+            }
+
+            completeSignUpLink = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?quickstart=true&email=${email}&token=${token}`;
+
+            // Store token for email outside transaction
+            await sendEmail(
+                WelcomeQuickStart({
+                    username: email,
+                    link: completeSignUpLink,
+                    fallbackLink: `${config.getRawConfig().app.dashboard_url}/auth/reset-password?quickstart=true&email=${email}`,
+                    resourceMethod: method,
+                    resourceHostname: ip,
+                    resourcePort: port,
+                    resourceUrl: `https://${fullDomain}`,
+                    cliCommand: `newt --id ${newtId} --secret ${secret}`
+                }),
+                {
+                    to: email,
+                    from: config.getNoReplyEmail(),
+                    subject: `Access your Pangolin dashboard and resources`
+                }
+            );
+        });
+
+        return response<QuickStartResponse>(res, {
+            data: {
+                newtId: newtId!,
+                newtSecret: secret!,
+                resourceUrl: `https://${fullDomain!}`,
+                completeSignUpLink: completeSignUpLink!
+            },
+            success: true,
+            error: false,
+            message: "Quick start completed successfully",
+            status: HttpCode.OK
+        });
+    } catch (e) {
+        if (e instanceof SqliteError && e.code === "SQLITE_CONSTRAINT_UNIQUE") {
+            if (config.getRawConfig().app.log_failed_attempts) {
+                logger.info(
+                    `Account already exists with that email. Email: ${email}. IP: ${req.ip}.`
+                );
+            }
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "A user with that email address already exists"
+                )
+            );
+        } else {
+            logger.error(e);
+            return next(
+                createHttpError(
+                    HttpCode.INTERNAL_SERVER_ERROR,
+                    "Failed to do quick start"
+                )
+            );
+        }
+    }
+}
+
+const BACKEND_SECRET_KEY = "4f9b6000-5d1a-11f0-9de7-ff2cc032f501";
+
+/**
+ * Validates a token received from the frontend.
+ * @param {string} token The validation token from the request.
+ * @returns {{ isValid: boolean; message: string }} An object indicating if the token is valid.
+ */
+const validateTokenOnApi = (
+    token: string
+): { isValid: boolean; message: string } => {
+    if (token === DEMO_UBO_KEY) {
+        // Special case for demo UBO key
+        return { isValid: true, message: "Demo UBO key is valid." };
+    }
+
+    if (!token) {
+        return { isValid: false, message: "Error: No token provided." };
+    }
+
+    try {
+        // 1. Decode the base64 string
+        const decodedB64 = atob(token);
+
+        // 2. Reverse the character code manipulation
+        const deobfuscated = decodedB64
+            .split("")
+            .map((char) => String.fromCharCode(char.charCodeAt(0) - 5)) // Reverse the shift
+            .join("");
+
+        // 3. Split the data to get the original secret and timestamp
+        const parts = deobfuscated.split("|");
+        if (parts.length !== 2) {
+            throw new Error("Invalid token format.");
+        }
+        const receivedKey = parts[0];
+        const tokenTimestamp = parseInt(parts[1], 10);
+
+        // 4. Check if the secret key matches
+        if (receivedKey !== BACKEND_SECRET_KEY) {
+            return { isValid: false, message: "Invalid token: Key mismatch." };
+        }
+
+        // 5. Check if the timestamp is recent (e.g., within 30 seconds) to prevent replay attacks
+        const now = Date.now();
+        const timeDifference = now - tokenTimestamp;
+
+        if (timeDifference > 30000) {
+            // 30 seconds
+            return { isValid: false, message: "Invalid token: Expired." };
+        }
+
+        if (timeDifference < 0) {
+            // Timestamp is in the future
+            return {
+                isValid: false,
+                message: "Invalid token: Timestamp is in the future."
+            };
+        }
+
+        // If all checks pass, the token is valid
+        return { isValid: true, message: "Token is valid!" };
+    } catch (error) {
+        // This will catch errors from atob (if not valid base64) or other issues.
+        return {
+            isValid: false,
+            message: `Error: ${(error as Error).message}`
+        };
+    }
+};
--- a/server/private/routers/billing/changeTier.ts
+++ b/server/private/routers/billing/changeTier.ts
@@ -1,263 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 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 { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { customers, db, subscriptions, subscriptionItems } from "@server/db";
-import { eq, and, or } 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 stripe from "#private/lib/stripe";
-import {
-    getHomeLabFeaturePriceSet,
-    getScaleFeaturePriceSet,
-    getStarterFeaturePriceSet,
-    getLineItems,
-    FeatureId,
-    type FeaturePriceSet
-} from "@server/lib/billing";
-
-const changeTierSchema = z.strictObject({
-    orgId: z.string()
-});
-
-const changeTierBodySchema = z.strictObject({
-    tier: z.enum(["home_lab", "starter", "scale"])
-});
-
-export async function changeTier(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = changeTierSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const { orgId } = parsedParams.data;
-
-        const parsedBody = changeTierBodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { tier } = parsedBody.data;
-
-        // Get the customer for this org
-        const [customer] = await db
-            .select()
-            .from(customers)
-            .where(eq(customers.orgId, orgId))
-            .limit(1);
-
-        if (!customer) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "No customer found for this organization"
-                )
-            );
-        }
-
-        // Get the active subscription for this customer
-        const [subscription] = await db
-            .select()
-            .from(subscriptions)
-            .where(
-                and(
-                    eq(subscriptions.customerId, customer.customerId),
-                    eq(subscriptions.status, "active"),
-                    or(
-                        eq(subscriptions.type, "home_lab"),
-                        eq(subscriptions.type, "starter"),
-                        eq(subscriptions.type, "scale")
-                    )
-                )
-            )
-            .limit(1);
-
-        if (!subscription) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "No active subscription found for this organization"
-                )
-            );
-        }
-
-        // Get the target tier's price set
-        let targetPriceSet: FeaturePriceSet;
-        if (tier === "home_lab") {
-            targetPriceSet = getHomeLabFeaturePriceSet();
-        } else if (tier === "starter") {
-            targetPriceSet = getStarterFeaturePriceSet();
-        } else if (tier === "scale") {
-            targetPriceSet = getScaleFeaturePriceSet();
-        } else {
-            return next(createHttpError(HttpCode.BAD_REQUEST, "Invalid tier"));
-        }
-
-        // Get current subscription items from our database
-        const currentItems = await db
-            .select()
-            .from(subscriptionItems)
-            .where(
-                eq(
-                    subscriptionItems.subscriptionId,
-                    subscription.subscriptionId
-                )
-            );
-
-        if (currentItems.length === 0) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "No subscription items found"
-                )
-            );
-        }
-
-        // Retrieve the full subscription from Stripe to get item IDs
-        const stripeSubscription = await stripe!.subscriptions.retrieve(
-            subscription.subscriptionId
-        );
-
-        // Determine if we're switching between different products
-        // home_lab uses HOME_LAB product, starter/scale use USERS product
-        const currentTier = subscription.type;
-        const switchingProducts =
-            (currentTier === "home_lab" && (tier === "starter" || tier === "scale")) ||
-            ((currentTier === "starter" || currentTier === "scale") && tier === "home_lab");
-
-        let updatedSubscription;
-
-        if (switchingProducts) {
-            // When switching between different products, we need to:
-            // 1. Delete old subscription items
-            // 2. Add new subscription items
-            logger.info(
-                `Switching products from ${currentTier} to ${tier} for subscription ${subscription.subscriptionId}`
-            );
-
-            // Build array to delete all existing items and add new ones
-            const itemsToUpdate: any[] = [];
-
-            // Mark all existing items for deletion
-            for (const stripeItem of stripeSubscription.items.data) {
-                itemsToUpdate.push({
-                    id: stripeItem.id,
-                    deleted: true
-                });
-            }
-
-            // Add new items for the target tier
-            const newLineItems = await getLineItems(targetPriceSet, orgId);
-            for (const lineItem of newLineItems) {
-                itemsToUpdate.push(lineItem);
-            }
-
-            updatedSubscription = await stripe!.subscriptions.update(
-                subscription.subscriptionId,
-                {
-                    items: itemsToUpdate,
-                    proration_behavior: "create_prorations"
-                }
-            );
-        } else {
-            // Same product, different price tier (starter <-> scale)
-            // We can simply update the price
-            logger.info(
-                `Updating price from ${currentTier} to ${tier} for subscription ${subscription.subscriptionId}`
-            );
-
-            const itemsToUpdate = stripeSubscription.items.data.map(
-                (stripeItem) => {
-                    // Find the corresponding item in our database
-                    const dbItem = currentItems.find(
-                        (item) => item.priceId === stripeItem.price.id
-                    );
-
-                    if (!dbItem) {
-                        // Keep the existing item unchanged if we can't find it
-                        return {
-                            id: stripeItem.id,
-                            price: stripeItem.price.id
-                        };
-                    }
-
-                    // Map to the corresponding feature in the new tier
-                    const newPriceId = targetPriceSet[FeatureId.USERS];
-
-                    if (newPriceId) {
-                        return {
-                            id: stripeItem.id,
-                            price: newPriceId
-                        };
-                    }
-
-                    // If no mapping found, keep existing
-                    return {
-                        id: stripeItem.id,
-                        price: stripeItem.price.id
-                    };
-                }
-            );
-
-            updatedSubscription = await stripe!.subscriptions.update(
-                subscription.subscriptionId,
-                {
-                    items: itemsToUpdate,
-                    proration_behavior: "create_prorations"
-                }
-            );
-        }
-
-        logger.info(
-            `Successfully changed tier to ${tier} for org ${orgId}, subscription ${subscription.subscriptionId}`
-        );
-
-        return response<{ subscriptionId: string; newTier: string }>(res, {
-            data: {
-                subscriptionId: updatedSubscription.id,
-                newTier: tier
-            },
-            success: true,
-            error: false,
-            message: "Tier change successful",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error("Error changing tier:", error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred while changing tier"
-            )
-        );
-    }
-}
--- a/server/private/routers/billing/createCheckoutSessionSAAS.ts
+++ b/server/private/routers/billing/createCheckoutSessionSAAS.ts
@@ -22,19 +22,14 @@ import logger from "@server/logger";
 import config from "@server/lib/config";
 import { fromError } from "zod-validation-error";
 import stripe from "#private/lib/stripe";
-import { getHomeLabFeaturePriceSet, getLineItems, getScaleFeaturePriceSet, getStarterFeaturePriceSet } from "@server/lib/billing";
-import { usageService } from "@server/lib/billing/usageService";
-import Stripe from "stripe";
+import { getLineItems, getStandardFeaturePriceSet } from "@server/lib/billing";
+import { getTierPriceSet, TierId } from "@server/lib/billing/tiers";

 const createCheckoutSessionSchema = z.strictObject({
    orgId: z.string()
 });

-const createCheckoutSessionBodySchema = z.strictObject({
-    tier: z.enum(["home_lab", "starter", "scale"]),
-});
-
-export async function createCheckoutSession(
+export async function createCheckoutSessionSAAS(
    req: Request,
    res: Response,
    next: NextFunction
@@ -52,18 +47,6 @@ export async function createCheckoutSession(

        const { orgId } = parsedParams.data;

-        const parsedBody = createCheckoutSessionBodySchema.safeParse(req.body);
-        if (!parsedBody.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedBody.error).toString()
-                )
-            );
-        }
-
-        const { tier } = parsedBody.data;
-
        // check if we already have a customer for this org
        const [customer] = await db
            .select()
@@ -82,25 +65,18 @@ export async function createCheckoutSession(
            );
        }

-        let lineItems: Stripe.Checkout.SessionCreateParams.LineItem[];
-        if (tier === "home_lab") {
-            lineItems = await getLineItems(getHomeLabFeaturePriceSet(), orgId);
-        } else if (tier === "starter") {
-            lineItems = await getLineItems(getStarterFeaturePriceSet(), orgId);
-        } else if (tier === "scale") {
-            lineItems = await getLineItems(getScaleFeaturePriceSet(), orgId);
-        } else {
-            return next(
-                createHttpError(HttpCode.BAD_REQUEST, "Invalid plan")
-            );
-        }
-
-        logger.debug(`Line items: ${JSON.stringify(lineItems)}`)
+        const standardTierPrice = getTierPriceSet()[TierId.STANDARD];

        const session = await stripe!.checkout.sessions.create({
            client_reference_id: orgId, // So we can look it up the org later on the webhook
            billing_address_collection: "required",
-            line_items: lineItems,
+            line_items: [
+                {
+                    price: standardTierPrice, // Use the standard tier
+                    quantity: 1
+                },
+                ...getLineItems(getStandardFeaturePriceSet())
+            ], // Start with the standard feature set that matches the free limits
            customer: customer.customerId,
            mode: "subscription",
            success_url: `${config.getRawConfig().app.dashboard_url}/${orgId}/settings/billing?success=true&session_id={CHECKOUT_SESSION_ID}`,
--- a/server/private/routers/billing/getOrgUsage.ts
+++ b/server/private/routers/billing/getOrgUsage.ts
@@ -78,9 +78,9 @@ export async function getOrgUsage(
        // Get usage for org
        const usageData = [];

-        const sites = await usageService.getUsage(
+        const siteUptime = await usageService.getUsage(
            orgId,
-            FeatureId.SITES
+            FeatureId.SITE_UPTIME
        );
        const users = await usageService.getUsageDaily(orgId, FeatureId.USERS);
        const domains = await usageService.getUsageDaily(
@@ -96,8 +96,8 @@ export async function getOrgUsage(
            FeatureId.EGRESS_DATA_MB
        );

-        if (sites) {
-            usageData.push(sites);
+        if (siteUptime) {
+            usageData.push(siteUptime);
        }
        if (users) {
            usageData.push(users);
--- a/server/private/routers/billing/hooks/getSubType.ts
+++ b/server/private/routers/billing/hooks/getSubType.ts
@@ -1,61 +1,35 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 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 {
    getLicensePriceSet,
 } from "@server/lib/billing/licenses";
 import {
-    getHomeLabFeaturePriceSet,
-    getStarterFeaturePriceSet,
-    getScaleFeaturePriceSet,
-} from "@server/lib/billing/features";
+    getTierPriceSet,
+} from "@server/lib/billing/tiers";
 import Stripe from "stripe";

-export type SubscriptionType = "home_lab" | "starter" | "scale" | "license";
-
-export function getSubType(fullSubscription: Stripe.Response<Stripe.Subscription>): SubscriptionType | null {
+export function getSubType(fullSubscription: Stripe.Response<Stripe.Subscription>): "saas" | "license" {
    // Determine subscription type by checking subscription items
-    if (!Array.isArray(fullSubscription.items?.data) || fullSubscription.items.data.length === 0) {
-        return null;
-    }
+    let type: "saas" | "license" = "saas";
+    if (Array.isArray(fullSubscription.items?.data)) {
+        for (const item of fullSubscription.items.data) {
+            const priceId = item.price.id;

-    for (const item of fullSubscription.items.data) {
-        const priceId = item.price.id;
+            // Check if price ID matches any license price
+            const licensePrices = Object.values(getLicensePriceSet());

-        // Check if price ID matches any license price
-        const licensePrices = Object.values(getLicensePriceSet());
-        if (licensePrices.includes(priceId)) {
-            return "license";
-        }
+            if (licensePrices.includes(priceId)) {
+                type = "license";
+                break;
+            }

-        // Check if price ID matches home lab tier
-        const homeLabPrices = Object.values(getHomeLabFeaturePriceSet());
-        if (homeLabPrices.includes(priceId)) {
-            return "home_lab";
-        }
+            // Check if price ID matches any tier price (saas)
+            const tierPrices = Object.values(getTierPriceSet());

-        // Check if price ID matches starter tier
-        const starterPrices = Object.values(getStarterFeaturePriceSet());
-        if (starterPrices.includes(priceId)) {
-            return "starter";
-        }
-
-        // Check if price ID matches scale tier
-        const scalePrices = Object.values(getScaleFeaturePriceSet());
-        if (scalePrices.includes(priceId)) {
-            return "scale";
+            if (tierPrices.includes(priceId)) {
+                type = "saas";
+                break;
+            }
        }
    }

-    return null;
-}
+    return type;
+}
--- a/server/private/routers/billing/hooks/handleSubscriptionCreated.ts
+++ b/server/private/routers/billing/hooks/handleSubscriptionCreated.ts
@@ -59,8 +59,6 @@ export async function handleSubscriptionCreated(
            return;
        }

-        const type = getSubType(fullSubscription);
-
        const newSubscription = {
            subscriptionId: subscription.id,
            customerId: subscription.customer as string,
@@ -68,8 +66,7 @@ export async function handleSubscriptionCreated(
            canceledAt: subscription.canceled_at
                ? subscription.canceled_at
                : null,
-            createdAt: subscription.created,
-            type: type
+            createdAt: subscription.created
        };

        await db.insert(subscriptions).values(newSubscription);
@@ -132,15 +129,15 @@ export async function handleSubscriptionCreated(
            return;
        }

-        if (type === "home_lab" || type === "starter" || type === "scale") {
+        const type = getSubType(fullSubscription);
+        if (type === "saas") {
            logger.debug(
-                `Handling SAAS subscription lifecycle for org ${customer.orgId} with type ${type}`
+                `Handling SAAS subscription lifecycle for org ${customer.orgId}`
            );
            // we only need to handle the limit lifecycle for saas subscriptions not for the licenses
            await handleSubscriptionLifesycle(
                customer.orgId,
-                subscription.status,
-                type
+                subscription.status
            );

            const [orgUserRes] = await db
--- a/server/private/routers/billing/hooks/handleSubscriptionDeleted.ts
+++ b/server/private/routers/billing/hooks/handleSubscriptionDeleted.ts
@@ -76,15 +76,14 @@ export async function handleSubscriptionDeleted(
        }

        const type = getSubType(fullSubscription);
-        if (type == "home_lab" || type == "starter" || type == "scale") {
+        if (type === "saas") {
            logger.debug(
                `Handling SaaS subscription deletion for orgId ${customer.orgId} and subscription ID ${subscription.id}`
            );

            await handleSubscriptionLifesycle(
                customer.orgId,
-                subscription.status,
-                type
+                subscription.status
            );

            const [orgUserRes] = await db
--- a/server/private/routers/billing/hooks/handleSubscriptionUpdated.ts
+++ b/server/private/routers/billing/hooks/handleSubscriptionUpdated.ts
@@ -64,8 +64,6 @@ export async function handleSubscriptionUpdated(
            .where(eq(customers.customerId, subscription.customer as string))
            .limit(1);

-        const type = getSubType(fullSubscription);
-
        await db
            .update(subscriptions)
            .set({
@@ -74,8 +72,7 @@ export async function handleSubscriptionUpdated(
                    ? subscription.canceled_at
                    : null,
                updatedAt: Math.floor(Date.now() / 1000),
-                billingCycleAnchor: subscription.billing_cycle_anchor,
-                type: type
+                billingCycleAnchor: subscription.billing_cycle_anchor
            })
            .where(eq(subscriptions.subscriptionId, subscription.id));

@@ -237,17 +234,17 @@ export async function handleSubscriptionUpdated(
            }
            // --- end usage update ---

-            if (type === "home_lab" || type === "starter" || type === "scale") {
+            const type = getSubType(fullSubscription);
+            if (type === "saas") {
                logger.debug(
-                    `Handling SAAS subscription lifecycle for org ${customer.orgId} with type ${type}`
+                    `Handling SAAS subscription lifecycle for org ${customer.orgId}`
                );
                // we only need to handle the limit lifecycle for saas subscriptions not for the licenses
                await handleSubscriptionLifesycle(
                    customer.orgId,
-                    subscription.status,
-                    type
+                    subscription.status
                );
-            } else if (type === "license") {
+            } else {
                if (subscription.status === "canceled" || subscription.status == "unpaid" || subscription.status == "incomplete_expired") {
                    try {
                        // WARNING:
--- a/server/private/routers/billing/index.ts
+++ b/server/private/routers/billing/index.ts
@@ -11,9 +11,8 @@
 * This file is not licensed under the AGPLv3.
 */

-export * from "./createCheckoutSession";
+export * from "./createCheckoutSessionSAAS";
 export * from "./createPortalSession";
 export * from "./getOrgSubscriptions";
 export * from "./getOrgUsage";
 export * from "./internalGetOrgTier";
-export * from "./changeTier";
--- a/server/private/routers/billing/subscriptionLifecycle.ts
+++ b/server/private/routers/billing/subscriptionLifecycle.ts
@@ -13,62 +13,36 @@

 import {
    freeLimitSet,
-    homeLabLimitSet,
-    starterLimitSet,
-    scaleLimitSet,
    limitsService,
-    LimitSet
+    subscribedLimitSet
 } from "@server/lib/billing";
 import { usageService } from "@server/lib/billing/usageService";
-import { SubscriptionType } from "./hooks/getSubType";
-
-function getLimitSetForSubscriptionType(subType: SubscriptionType | null): LimitSet {
-    switch (subType) {
-        case "home_lab":
-            return homeLabLimitSet;
-        case "starter":
-            return starterLimitSet;
-        case "scale":
-            return scaleLimitSet;
-        case "license":
-            // License subscriptions use starter limits by default
-            // This can be adjusted based on your business logic
-            return starterLimitSet;
-        default:
-            return freeLimitSet;
-    }
-}
+import logger from "@server/logger";

 export async function handleSubscriptionLifesycle(
    orgId: string,
-    status: string,
-    subType: SubscriptionType | null
+    status: string
 ) {
    switch (status) {
        case "active":
-            const activeLimitSet = getLimitSetForSubscriptionType(subType);
-            await limitsService.applyLimitSetToOrg(orgId, activeLimitSet);
+            await limitsService.applyLimitSetToOrg(orgId, subscribedLimitSet);
            await usageService.checkLimitSet(orgId, true);
            break;
        case "canceled":
-            // Subscription canceled - revert to free tier
            await limitsService.applyLimitSetToOrg(orgId, freeLimitSet);
            await usageService.checkLimitSet(orgId, true);
            break;
        case "past_due":
-            // Payment past due - keep current limits but notify customer
-            // Limits will revert to free tier if it becomes unpaid
+            // Optionally handle past due status, e.g., notify customer
            break;
        case "unpaid":
-            // Subscription unpaid - revert to free tier
            await limitsService.applyLimitSetToOrg(orgId, freeLimitSet);
            await usageService.checkLimitSet(orgId, true);
            break;
        case "incomplete":
-            // Payment incomplete - give them time to complete payment
+            // Optionally handle incomplete status, e.g., notify customer
            break;
        case "incomplete_expired":
-            // Payment never completed - revert to free tier
            await limitsService.applyLimitSetToOrg(orgId, freeLimitSet);
            await usageService.checkLimitSet(orgId, true);
            break;
--- a/server/private/routers/external.ts
+++ b/server/private/routers/external.ts
@@ -76,7 +76,6 @@ unauthenticated.post(
 authenticated.put(
    "/org/:orgId/idp/oidc",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.createIdp),
    logActionAudit(ActionsEnum.createIdp),
@@ -86,7 +85,6 @@ authenticated.put(
 authenticated.post(
    "/org/:orgId/idp/:idpId/oidc",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyIdpAccess,
    verifyUserHasAction(ActionsEnum.updateIdp),
@@ -143,20 +141,29 @@ authenticated.post(
 );

 if (build === "saas") {
-    authenticated.post(
-        "/org/:orgId/billing/create-checkout-session",
-        verifyOrgAccess,
-        verifyUserHasAction(ActionsEnum.billing),
-        logActionAudit(ActionsEnum.billing),
-        billing.createCheckoutSession
+    unauthenticated.post(
+        "/quick-start",
+        rateLimit({
+            windowMs: 15 * 60 * 1000,
+            max: 100,
+            keyGenerator: (req) => req.path,
+            handler: (req, res, next) => {
+                const message = `We're too busy right now. Please try again later.`;
+                return next(
+                    createHttpError(HttpCode.TOO_MANY_REQUESTS, message)
+                );
+            },
+            store: createStore()
+        }),
+        auth.quickStart
    );

    authenticated.post(
-        "/org/:orgId/billing/change-tier",
+        "/org/:orgId/billing/create-checkout-session-saas",
        verifyOrgAccess,
        verifyUserHasAction(ActionsEnum.billing),
        logActionAudit(ActionsEnum.billing),
-        billing.changeTier
+        billing.createCheckoutSessionSAAS
    );

    authenticated.post(
@@ -279,7 +286,6 @@ authenticated.delete(
 authenticated.put(
    "/org/:orgId/login-page",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.createLoginPage),
    logActionAudit(ActionsEnum.createLoginPage),
@@ -289,7 +295,6 @@ authenticated.put(
 authenticated.post(
    "/org/:orgId/login-page/:loginPageId",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyLoginPageAccess,
    verifyUserHasAction(ActionsEnum.updateLoginPage),
@@ -318,7 +323,6 @@ authenticated.get(
 authenticated.get(
    "/org/:orgId/approvals",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.listApprovals),
    logActionAudit(ActionsEnum.listApprovals),
@@ -335,7 +339,6 @@ authenticated.get(
 authenticated.put(
    "/org/:orgId/approvals/:approvalId",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.updateApprovals),
    logActionAudit(ActionsEnum.updateApprovals),
@@ -345,7 +348,6 @@ authenticated.put(
 authenticated.get(
    "/org/:orgId/login-page-branding",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.getLoginPage),
    logActionAudit(ActionsEnum.getLoginPage),
@@ -355,7 +357,6 @@ authenticated.get(
 authenticated.put(
    "/org/:orgId/login-page-branding",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.updateLoginPage),
    logActionAudit(ActionsEnum.updateLoginPage),
@@ -365,7 +366,6 @@ authenticated.put(
 authenticated.delete(
    "/org/:orgId/login-page-branding",
    verifyValidLicense,
-    verifyValidSubscription,
    verifyOrgAccess,
    verifyUserHasAction(ActionsEnum.deleteLoginPage),
    logActionAudit(ActionsEnum.deleteLoginPage),
--- a/server/private/routers/loginPage/createLoginPage.ts
+++ b/server/private/routers/loginPage/createLoginPage.ts
@@ -30,7 +30,9 @@ import { fromError } from "zod-validation-error";
 import { eq, and } from "drizzle-orm";
 import { validateAndConstructDomain } from "@server/lib/domainUtils";
 import { createCertificate } from "#private/routers/certificates/createCertificate";
-
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
+import { build } from "@server/build";
 import { CreateLoginPageResponse } from "@server/routers/loginPage/types";

 const paramsSchema = z.strictObject({
@@ -74,6 +76,19 @@ export async function createLoginPage(

        const { orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        const [existing] = await db
            .select()
            .from(loginPageOrg)
--- a/server/private/routers/loginPage/deleteLoginPageBranding.ts
+++ b/server/private/routers/loginPage/deleteLoginPageBranding.ts
@@ -25,7 +25,9 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq } from "drizzle-orm";
-
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
+import { build } from "@server/build";

 const paramsSchema = z
    .object({
@@ -51,6 +53,18 @@ export async function deleteLoginPageBranding(

        const { orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }

        const [existingLoginPageBranding] = await db
            .select()
--- a/server/private/routers/loginPage/getLoginPageBranding.ts
+++ b/server/private/routers/loginPage/getLoginPageBranding.ts
@@ -25,7 +25,9 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq } from "drizzle-orm";
-
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
+import { build } from "@server/build";

 const paramsSchema = z.strictObject({
    orgId: z.string()
@@ -49,6 +51,19 @@ export async function getLoginPageBranding(

        const { orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        const [existingLoginPageBranding] = await db
            .select()
            .from(loginPageBranding)
--- a/server/private/routers/loginPage/updateLoginPage.ts
+++ b/server/private/routers/loginPage/updateLoginPage.ts
@@ -23,7 +23,9 @@ import { eq, and } from "drizzle-orm";
 import { validateAndConstructDomain } from "@server/lib/domainUtils";
 import { subdomainSchema } from "@server/lib/schemas";
 import { createCertificate } from "#private/routers/certificates/createCertificate";
-
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
+import { build } from "@server/build";
 import { UpdateLoginPageResponse } from "@server/routers/loginPage/types";

 const paramsSchema = z
@@ -85,6 +87,18 @@ export async function updateLoginPage(

        const { loginPageId, orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }

        const [existingLoginPage] = await db
            .select()
--- a/server/private/routers/loginPage/upsertLoginPageBranding.ts
+++ b/server/private/routers/loginPage/upsertLoginPageBranding.ts
@@ -25,8 +25,10 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq, InferInsertModel } from "drizzle-orm";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import { build } from "@server/build";
-import config from "#private/lib/config";
+import config from "@server/private/lib/config";

 const paramsSchema = z.strictObject({
    orgId: z.string()
@@ -126,6 +128,19 @@ export async function upsertLoginPageBranding(

        const { orgId } = parsedParams.data;

+        if (build === "saas") {
+            const { tier } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        let updateData = parsedBody.data satisfies InferInsertModel<
            typeof loginPageBranding
        >;
--- a/server/private/routers/orgIdp/createOrgOidcIdp.ts
+++ b/server/private/routers/orgIdp/createOrgOidcIdp.ts
@@ -24,6 +24,9 @@ import { idp, idpOidcConfig, idpOrg, orgs } from "@server/db";
 import { generateOidcRedirectUrl } from "@server/lib/idp/generateRedirectUrl";
 import { encrypt } from "@server/lib/crypto";
 import config from "@server/lib/config";
+import { build } from "@server/build";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import { CreateOrgIdpResponse } from "@server/routers/orgIdp/types";

 const paramsSchema = z.strictObject({ orgId: z.string().nonempty() });
@@ -106,6 +109,19 @@ export async function createOrgOidcIdp(
            tags
        } = parsedBody.data;

+        if (build === "saas") {
+            const { tier, active } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        const key = config.getRawConfig().server.secret!;

        const encryptedSecret = encrypt(clientSecret, key);
--- a/server/private/routers/orgIdp/updateOrgOidcIdp.ts
+++ b/server/private/routers/orgIdp/updateOrgOidcIdp.ts
@@ -24,6 +24,9 @@ import { idp, idpOidcConfig } from "@server/db";
 import { eq, and } from "drizzle-orm";
 import { encrypt } from "@server/lib/crypto";
 import config from "@server/lib/config";
+import { build } from "@server/build";
+import { getOrgTierData } from "#private/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";

 const paramsSchema = z
    .object({
@@ -111,6 +114,19 @@ export async function updateOrgOidcIdp(
            tags
        } = parsedBody.data;

+        if (build === "saas") {
+            const { tier, active } = await getOrgTierData(orgId);
+            const subscribed = tier === TierId.STANDARD;
+            if (!subscribed) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "This organization's current plan does not support this feature."
+                    )
+                );
+            }
+        }
+
        // Check if IDP exists and is of type OIDC
        const [existingIdp] = await db
            .select()
--- a/server/routers/badger/logRequestAudit.ts
+++ b/server/routers/badger/logRequestAudit.ts
@@ -1,6 +1,6 @@
 import { db, orgs, requestAuditLog } from "@server/db";
 import logger from "@server/logger";
-import { and, eq, lt, sql } from "drizzle-orm";
+import { and, eq, lt } from "drizzle-orm";
 import cache from "@server/lib/cache";
 import { calculateCutoffTimestamp } from "@server/lib/cleanupLogs";
 import { stripPortFromHost } from "@server/lib/ip";
@@ -67,27 +67,17 @@ async function flushAuditLogs() {
    const logsToWrite = auditLogBuffer.splice(0, auditLogBuffer.length);

    try {
-        // Use a transaction to ensure all inserts succeed or fail together
-        // This prevents index corruption from partial writes
-        await db.transaction(async (tx) => {
-            // Batch insert logs in groups of 25 to avoid overwhelming the database
-            const BATCH_DB_SIZE = 25;
-            for (let i = 0; i < logsToWrite.length; i += BATCH_DB_SIZE) {
-                const batch = logsToWrite.slice(i, i + BATCH_DB_SIZE);
-                await tx.insert(requestAuditLog).values(batch);
-            }
-        });
+        // Batch insert logs in groups of 25 to avoid overwhelming the database
+        const BATCH_DB_SIZE = 25;
+        for (let i = 0; i < logsToWrite.length; i += BATCH_DB_SIZE) {
+            const batch = logsToWrite.slice(i, i + BATCH_DB_SIZE);
+            await db.insert(requestAuditLog).values(batch);
+        }
        logger.debug(`Flushed ${logsToWrite.length} audit logs to database`);
    } catch (error) {
        logger.error("Error flushing audit logs:", error);
-        // On transaction error, put logs back at the front of the buffer to retry
-        // but only if buffer isn't too large
-        if (auditLogBuffer.length < MAX_BUFFER_SIZE - logsToWrite.length) {
-            auditLogBuffer.unshift(...logsToWrite);
-            logger.info(`Re-queued ${logsToWrite.length} audit logs for retry`);
-        } else {
-            logger.error(`Buffer full, dropped ${logsToWrite.length} audit logs`);
-        }
+        // On error, we lose these logs - consider a fallback strategy if needed
+        // (e.g., write to file, or put back in buffer with retry limit)
    } finally {
        isFlushInProgress = false;
        // If buffer filled up while we were flushing, flush again
--- a/server/routers/badger/verifySession.ts
+++ b/server/routers/badger/verifySession.ts
@@ -18,6 +18,7 @@ import {
    ResourcePassword,
    ResourcePincode,
    ResourceRule,
+    resourceSessions
 } from "@server/db";
 import config from "@server/lib/config";
 import { isIpInCidr, stripPortFromHost } from "@server/lib/ip";
@@ -31,6 +32,7 @@ import { fromError } from "zod-validation-error";
 import { getCountryCodeForIp } from "@server/lib/geoip";
 import { getAsnForIp } from "@server/lib/asn";
 import { getOrgTierData } from "#dynamic/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import { verifyPassword } from "@server/auth/password";
 import {
    checkOrgAccessPolicy,
@@ -38,8 +40,8 @@ import {
 } from "#dynamic/lib/checkOrgAccessPolicy";
 import { logRequestAudit } from "./logRequestAudit";
 import cache from "@server/lib/cache";
+import semver from "semver";
 import { APP_VERSION } from "@server/lib/consts";
-import { isSubscribed } from "#private/lib/isSubscribed";

 const verifyResourceSessionSchema = z.object({
    sessions: z.record(z.string(), z.string()).optional(),
@@ -796,8 +798,8 @@ async function notAllowed(
 ) {
    let loginPage: LoginPage | null = null;
    if (orgId) {
-        const subscribed = await isSubscribed(orgId);
-        if (subscribed) {
+        const { tier } = await getOrgTierData(orgId); // returns null in oss
+        if (tier === TierId.STANDARD) {
            loginPage = await getOrgLoginPage(orgId);
        }
    }
@@ -850,8 +852,8 @@ async function headerAuthChallenged(
 ) {
    let loginPage: LoginPage | null = null;
    if (orgId) {
-        const subscribed = await isSubscribed(orgId);
-        if (subscribed) {
+        const { tier } = await getOrgTierData(orgId); // returns null in oss
+        if (tier === TierId.STANDARD) {
            loginPage = await getOrgLoginPage(orgId);
        }
    }
--- a/server/routers/gerbil/receiveBandwidth.ts
+++ b/server/routers/gerbil/receiveBandwidth.ts
@@ -114,6 +114,7 @@ export async function updateSiteBandwidth(

    // Aggregate usage data by organization (collected outside transaction)
    const orgUsageMap = new Map<string, number>();
+    const orgUptimeMap = new Map<string, number>();

    if (activePeers.length > 0) {
        // Remove any active peers from offline tracking since they're sending data
@@ -165,6 +166,14 @@ export async function updateSiteBandwidth(
                        updatedSite.orgId,
                        currentOrgUsage + totalBandwidth
                    );
+
+                    // Add 10 seconds of uptime for each active site
+                    const currentOrgUptime =
+                        orgUptimeMap.get(updatedSite.orgId) || 0;
+                    orgUptimeMap.set(
+                        updatedSite.orgId,
+                        currentOrgUptime + 10 / 60
+                    );
                }
            } catch (error) {
                logger.error(
@@ -178,10 +187,10 @@ export async function updateSiteBandwidth(

    // Process usage updates outside of site update transactions
    // This separates the concerns and reduces lock contention
-    if (calcUsageAndLimits && (orgUsageMap.size > 0)) {
+    if (calcUsageAndLimits && (orgUsageMap.size > 0 || orgUptimeMap.size > 0)) {
        // Sort org IDs to ensure consistent lock ordering
        const allOrgIds = [
-            ...new Set([...orgUsageMap.keys()])
+            ...new Set([...orgUsageMap.keys(), ...orgUptimeMap.keys()])
        ].sort();

        for (const orgId of allOrgIds) {
@@ -211,6 +220,32 @@ export async function updateSiteBandwidth(
                            });
                    }
                }
+
+                // Process uptime usage for this org
+                const totalUptime = orgUptimeMap.get(orgId);
+                if (totalUptime) {
+                    const uptimeUsage = await usageService.add(
+                        orgId,
+                        FeatureId.SITE_UPTIME,
+                        totalUptime
+                    );
+                    if (uptimeUsage) {
+                        // Fire and forget - don't block on limit checking
+                        usageService
+                            .checkLimitSet(
+                                orgId,
+                                true,
+                                FeatureId.SITE_UPTIME,
+                                uptimeUsage
+                            )
+                            .catch((error: any) => {
+                                logger.error(
+                                    `Error checking uptime limits for org ${orgId}:`,
+                                    error
+                                );
+                            });
+                    }
+                }
            } catch (error) {
                logger.error(`Error processing usage for org ${orgId}:`, error);
                // Continue with other orgs
--- a/server/routers/idp/generateOidcUrl.ts
+++ b/server/routers/idp/generateOidcUrl.ts
@@ -14,7 +14,8 @@ import jsonwebtoken from "jsonwebtoken";
 import config from "@server/lib/config";
 import { decrypt } from "@server/lib/crypto";
 import { build } from "@server/build";
-import { isSubscribed } from "#dynamic/lib/isSubscribed";
+import { getOrgTierData } from "#dynamic/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";

 const paramsSchema = z
    .object({
@@ -112,7 +113,8 @@ export async function generateOidcUrl(
            }

            if (build === "saas") {
-                const subscribed = await isSubscribed(orgId);
+                const { tier } = await getOrgTierData(orgId);
+                const subscribed = tier === TierId.STANDARD;
                if (!subscribed) {
                    return next(
                        createHttpError(
--- a/server/routers/newt/handleNewtRegisterMessage.ts
+++ b/server/routers/newt/handleNewtRegisterMessage.ts
@@ -96,10 +96,10 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
        fetchContainers(newt.newtId);
    }

-    const rejectSites = await usageService.checkLimitSet(
+    const rejectSiteUptime = await usageService.checkLimitSet(
        oldSite.orgId,
        false,
-        FeatureId.SITES
+        FeatureId.SITE_UPTIME
    );
    const rejectEgressDataMb = await usageService.checkLimitSet(
        oldSite.orgId,
@@ -111,8 +111,8 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
    // const rejectUsers = await usageService.checkLimitSet(oldSite.orgId, false, FeatureId.USERS);
    // const rejectDomains = await usageService.checkLimitSet(oldSite.orgId, false, FeatureId.DOMAINS);

-    // if (rejectEgressDataMb || rejectSites || rejectUsers || rejectDomains) {
-    if (rejectEgressDataMb || rejectSites) {
+    // if (rejectEgressDataMb || rejectSiteUptime || rejectUsers || rejectDomains) {
+    if (rejectEgressDataMb || rejectSiteUptime) {
        logger.info(
            `Usage limits exceeded for org ${oldSite.orgId}. Rejecting newt registration.`
        );
--- a/server/routers/org/updateOrg.ts
+++ b/server/routers/org/updateOrg.ts
@@ -10,9 +10,10 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { build } from "@server/build";
+import { getOrgTierData } from "#dynamic/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import { cache } from "@server/lib/cache";
 import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
-import { isSubscribed } from "#dynamic/lib/isSubscribed";

 const updateOrgParamsSchema = z.strictObject({
    orgId: z.string()
@@ -94,10 +95,10 @@ export async function updateOrg(
            parsedBody.data.passwordExpiryDays = undefined;
        }

-        const subscribed = await isSubscribed(orgId);
+        const { tier } = await getOrgTierData(orgId);
        if (
            build == "saas" &&
-            subscribed &&
+            tier != TierId.STANDARD &&
            parsedBody.data.settingsLogRetentionDaysRequest &&
            parsedBody.data.settingsLogRetentionDaysRequest > 30
        ) {
--- a/server/routers/site/createSite.ts
+++ b/server/routers/site/createSite.ts
@@ -17,9 +17,6 @@ import { hashPassword } from "@server/auth/password";
 import { isValidIP } from "@server/lib/validators";
 import { isIpInCidr } from "@server/lib/ip";
 import { verifyExitNodeOrgAccess } from "#dynamic/lib/exitNodes";
-import { build } from "@server/build";
-import { usageService } from "@server/lib/billing/usageService";
-import { FeatureId } from "@server/lib/billing";

 const createSiteParamsSchema = z.strictObject({
    orgId: z.string()
@@ -128,35 +125,6 @@ export async function createSite(
            );
        }

-        if (build == "saas") {
-            const usage = await usageService.getUsage(orgId, FeatureId.SITES);
-            if (!usage) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        "No usage data found for this organization"
-                    )
-                );
-            }
-            const rejectSites = await usageService.checkLimitSet(
-                orgId,
-                false,
-                FeatureId.SITES,
-                {
-                    ...usage,
-                    instantaneousValue: (usage.instantaneousValue || 0) + 1
-                } // We need to add one to know if we are violating the limit
-            );
-            if (rejectSites) {
-                return next(
-                    createHttpError(
-                        HttpCode.FORBIDDEN,
-                        "Sites limit exceeded. Please upgrade your plan."
-                    )
-                );
-            }
-        }
-
        let updatedAddress = null;
        if (address) {
            if (!org.subnet) {
@@ -287,10 +255,22 @@ export async function createSite(

        const niceId = await getUniqueSiteName(orgId);

-        let newSite: Site | undefined;
-        let numSites: Site[] | undefined;
+        let newSite: Site;
+
        await db.transaction(async (trx) => {
-            if (type == "wireguard" || type == "newt") {
+            if (type == "newt") {
+                [newSite] = await trx
+                    .insert(sites)
+                    .values({
+                        orgId,
+                        name,
+                        niceId,
+                        address: updatedAddress || null,
+                        type,
+                        dockerSocketEnabled: true
+                    })
+                    .returning();
+            } else if (type == "wireguard") {
                // we are creating a site with an exit node (tunneled)
                if (!subnet) {
                    return next(
@@ -342,11 +322,9 @@ export async function createSite(
                        exitNodeId,
                        name,
                        niceId,
-                        address: updatedAddress || null,
                        subnet,
                        type,
-                        dockerSocketEnabled: type == "newt",
-                        ...(pubKey && type == "wireguard" && { pubKey })
+                        pubKey: pubKey || null
                    })
                    .returning();
            } else if (type == "local") {
@@ -433,35 +411,13 @@ export async function createSite(
                });
            }

-            numSites = await trx
-                .select()
-                .from(sites)
-                .where(eq(sites.orgId, orgId));
-        });
-
-        if (numSites) {
-            await usageService.updateDaily(
-                orgId,
-                FeatureId.SITES,
-                numSites.length
-            );
-        }
-
-        if (!newSite) {
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Failed to create site"
-                )
-            );
-        }
-
-        return response<CreateSiteResponse>(res, {
-            data: newSite,
-            success: true,
-            error: false,
-            message: "Site created successfully",
-            status: HttpCode.CREATED
+            return response<CreateSiteResponse>(res, {
+                data: newSite,
+                success: true,
+                error: false,
+                message: "Site created successfully",
+                status: HttpCode.CREATED
+            });
        });
    } catch (error) {
        logger.error(error);
--- a/server/routers/site/deleteSite.ts
+++ b/server/routers/site/deleteSite.ts
@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, Site, siteResources } from "@server/db";
+import { db, siteResources } from "@server/db";
 import { newts, newtSessions, sites } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
@@ -12,8 +12,6 @@ import { fromError } from "zod-validation-error";
 import { sendToClient } from "#dynamic/routers/ws";
 import { OpenAPITags, registry } from "@server/openApi";
 import { rebuildClientAssociationsFromSiteResource } from "@server/lib/rebuildClientAssociations";
-import { usageService } from "@server/lib/billing/usageService";
-import { FeatureId } from "@server/lib/billing";

 const deleteSiteSchema = z.strictObject({
    siteId: z.string().transform(Number).pipe(z.int().positive())
@@ -64,7 +62,6 @@ export async function deleteSite(
        }

        let deletedNewtId: string | null = null;
-        let numSites: Site[] | undefined;

        await db.transaction(async (trx) => {
            if (site.type == "wireguard") {
@@ -102,20 +99,8 @@ export async function deleteSite(
            }

            await trx.delete(sites).where(eq(sites.siteId, siteId));
-
-            numSites = await trx
-                .select()
-                .from(sites)
-                .where(eq(sites.orgId, site.orgId));
        });

-        if (numSites) {
-            await usageService.updateDaily(
-                site.orgId,
-                FeatureId.SITES,
-                numSites.length
-            );
-        }
        // Send termination message outside of transaction to prevent blocking
        if (deletedNewtId) {
            const payload = {
--- a/server/routers/user/createOrgUser.ts
+++ b/server/routers/user/createOrgUser.ts
@@ -13,8 +13,9 @@ import { generateId } from "@server/auth/sessions/app";
 import { usageService } from "@server/lib/billing/usageService";
 import { FeatureId } from "@server/lib/billing";
 import { build } from "@server/build";
+import { getOrgTierData } from "#dynamic/lib/billing";
+import { TierId } from "@server/lib/billing/tiers";
 import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs";
-import { isSubscribed } from "#dynamic/lib/isSubscribed";

 const paramsSchema = z.strictObject({
    orgId: z.string().nonempty()
@@ -131,8 +132,9 @@ export async function createOrgUser(
            );
        } else if (type === "oidc") {
            if (build === "saas") {
-                const subscribed = await isSubscribed(orgId);
-                if (subscribed) {
+                const { tier } = await getOrgTierData(orgId);
+                const subscribed = tier === TierId.STANDARD;
+                if (!subscribed) {
                    return next(
                        createHttpError(
                            HttpCode.FORBIDDEN,
--- a/src/app/[orgId]/settings/(private)/billing/page.tsx
+++ b/src/app/[orgId]/settings/(private)/billing/page.tsx
--- a/src/app/[orgId]/settings/access/users/create/page.tsx
+++ b/src/app/[orgId]/settings/access/users/create/page.tsx
@@ -48,6 +48,7 @@ import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import Image from "next/image";
 import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
+import { TierId } from "@server/lib/billing/tiers";

 type UserType = "internal" | "oidc";

--- a/src/app/auth/resource/[resourceGuid]/page.tsx
+++ b/src/app/auth/resource/[resourceGuid]/page.tsx
@@ -23,6 +23,8 @@ import type {
    LoadLoginPageBrandingResponse,
    LoadLoginPageResponse
 } from "@server/routers/loginPage/types";
+import { GetOrgTierResponse } from "@server/routers/billing/types";
+import { TierId } from "@server/lib/billing/tiers";
 import { CheckOrgUserAccessResponse } from "@server/routers/org";
 import OrgPolicyRequired from "@app/components/OrgPolicyRequired";
 import { isOrgSubscribed } from "@app/lib/api/isOrgSubscribed";
--- a/src/contexts/subscriptionStatusContext.ts
+++ b/src/contexts/subscriptionStatusContext.ts
@@ -5,7 +5,7 @@ type SubscriptionStatusContextType = {
    subscriptionStatus: GetOrgSubscriptionResponse | null;
    updateSubscriptionStatus: (updatedSite: GetOrgSubscriptionResponse) => void;
    isActive: () => boolean;
-    getTier: () => { tier: string | null; active: boolean };
+    getTier: () => string | null;
    isSubscribed: () => boolean;
    subscribed: boolean;
 };
--- a/src/lib/api/isOrgSubscribed.ts
+++ b/src/lib/api/isOrgSubscribed.ts
@@ -1,4 +1,5 @@
 import { build } from "@server/build";
+import { TierId } from "@server/lib/billing/tiers";
 import { cache } from "react";
 import { getCachedSubscription } from "./getCachedSubscription";
 import { priv } from ".";
@@ -20,7 +21,7 @@ export const isOrgSubscribed = cache(async (orgId: string) => {
        try {
            const subRes = await getCachedSubscription(orgId);
            subscribed =
-                (subRes.data.data.tier == "home_lab" || subRes.data.data.tier == "starter" || subRes.data.data.tier == "scale") &&
+                subRes.data.data.tier === TierId.STANDARD &&
                subRes.data.data.active;
        } catch {}
    }
--- a/src/providers/SubscriptionStatusProvider.tsx
+++ b/src/providers/SubscriptionStatusProvider.tsx
@@ -1,6 +1,7 @@
 "use client";

 import SubscriptionStatusContext from "@app/contexts/subscriptionStatusContext";
+import { getTierPriceSet, TierId } from "@server/lib/billing/tiers";
 import { GetOrgSubscriptionResponse } from "@server/routers/billing/types";
 import { useState } from "react";
 import { build } from "@server/build";
@@ -42,37 +43,34 @@ export function SubscriptionStatusProvider({
    };

    const getTier = () => {
+        const tierPriceSet = getTierPriceSet(env, sandbox_mode);
+
        if (subscriptionStatus?.subscriptions) {
            // Iterate through all subscriptions
-            for (const { subscription } of subscriptionStatus.subscriptions) {
-                if (
-                    subscription.type == "home_lab" ||
-                    subscription.type == "starter" ||
-                    subscription.type == "scale"
-                ) {
-                    return {
-                        tier: subscription.type,
-                        active: subscription.status === "active"
-                    };
+            for (const { subscription, items } of subscriptionStatus.subscriptions) {
+                if (items && items.length > 0) {
+                    // Iterate through tiers in order (earlier keys are higher tiers)
+                    for (const [tierId, priceId] of Object.entries(tierPriceSet)) {
+                        // Check if any subscription item matches this tier's price ID
+                        const matchingItem = items.find(
+                            (item) => item.priceId === priceId
+                        );
+                        if (matchingItem) {
+                            return tierId;
+                        }
+                    }
                }
            }
        }

-        return {
-            tier: null,
-            active: false
-        };
+        return null;
    };

    const isSubscribed = () => {
        if (build === "enterprise") {
            return true;
        }
-        const { tier, active } = getTier();
-        return (
-            (tier == "home_lab" || tier == "starter" || tier == "scale") &&
-            active
-        );
+        return getTier() === TierId.STANDARD;
    };

    const [subscribed, setSubscribed] = useState<boolean>(isSubscribed());
@@ -93,4 +91,4 @@ export function SubscriptionStatusProvider({
    );
 }

-export default SubscriptionStatusProvider;
+export default SubscriptionStatusProvider;
Author	SHA1	Message	Date
Owen	b4c01349d1	Merge branch 'dev'	2026-02-04 21:44:07 -08:00
Owen	e4d4c62833	Dont create newt sites with exit node or subnet	2026-02-02 18:19:13 -08:00
Owen	20ae903d7f	Subscribed limits for domains is higher	2026-02-02 16:46:48 -08:00
MoweME	b0566d3c6f	fix(i18n): correct German site terminology Updates the German translation to use "Standort" (site) instead of "Seite" (page) for consistency with the site context.	2026-01-29 10:01:30 -08:00
MoweME	5dda8c384f	fix(i18n): correct German translation strings Corrects mistranslation of device timestamp labels and fixes product name reference in site tunnel settings.	2026-01-29 10:01:30 -08:00
Owen	cb569ff14d	Properly insert PANGOLIN_SETUP_TOKEN into db Fixes #2361	2026-01-28 15:03:31 -08:00