diff --git a/.gitignore b/.gitignore
index 167b4a91..84dbd2d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ next-env.d.ts
 migrations
 tsconfig.tsbuildinfo
 config/config.yml
+config/postgres
+config/postgres*
 dist
 .dist
 installer
diff --git a/docker-compose.pg.yml b/docker-compose.pg.yml
index aeffc2cf..ee50d328 100644
--- a/docker-compose.pg.yml
+++ b/docker-compose.pg.yml
@@ -7,6 +7,8 @@ services:
       POSTGRES_DB: postgres # Default database name
       POSTGRES_USER: postgres # Default user
       POSTGRES_PASSWORD: password # Default password (change for production!)
+    volumes:
+      - ./config/postgres:/var/lib/postgresql/data
     ports:
       - "5432:5432" # Map host port 5432 to container port 5432
-    restart: no 
\ No newline at end of file
+    restart: no
diff --git a/server/setup/scriptsPg/1.9.0.ts b/server/setup/scriptsPg/1.9.0.ts
index a12f5617..bee521a3 100644
--- a/server/setup/scriptsPg/1.9.0.ts
+++ b/server/setup/scriptsPg/1.9.0.ts
@@ -3,23 +3,136 @@ import { sql } from "drizzle-orm";
 
 const version = "1.9.0";
 
+await migration();
+
 export default async function migration() {
     console.log(`Running setup script ${version}...`);
 
+    const resourceSiteMap = new Map<number, number>();
+    let firstSiteId: number = 1;
+
     try {
-        await db.execute(sql`
-            CREATE TABLE "setupTokens" (
-                "tokenId" varchar PRIMARY KEY NOT NULL,
-                "token" varchar NOT NULL,
-                "used" boolean DEFAULT false NOT NULL,
-                "dateCreated" varchar NOT NULL,
-                "dateUsed" varchar
+        // Get the first siteId to use as default
+        const firstSite = await db.execute(sql`SELECT "siteId" FROM "sites" LIMIT 1`);
+        if (firstSite.rows.length > 0) {
+            firstSiteId = firstSite.rows[0].siteId as number;
+        }
+
+        const resources = await db.execute(sql`
+            SELECT "resourceId", "siteId" FROM "resources" WHERE "siteId" IS NOT NULL
+        `);
+        for (const resource of resources.rows) {
+            resourceSiteMap.set(
+                resource.resourceId as number,
+                resource.siteId as number
             );
+        }
+    } catch (e) {
+        console.log("Error getting resources:", e);
+    }
+
+    try {
+        await db.execute(sql`BEGIN`);
+
+        await db.execute(sql`CREATE TABLE "setupTokens" (
+	"tokenId" varchar PRIMARY KEY NOT NULL,
+	"token" varchar NOT NULL,
+	"used" boolean DEFAULT false NOT NULL,
+	"dateCreated" varchar NOT NULL,
+	"dateUsed" varchar
+);`);
+
+        await db.execute(sql`CREATE TABLE "siteResources" (
+	"siteResourceId" serial PRIMARY KEY NOT NULL,
+	"siteId" integer NOT NULL,
+	"orgId" varchar NOT NULL,
+	"name" varchar NOT NULL,
+	"protocol" varchar NOT NULL,
+	"proxyPort" integer NOT NULL,
+	"destinationPort" integer NOT NULL,
+	"destinationIp" varchar NOT NULL,
+	"enabled" boolean DEFAULT true NOT NULL
+);`);
+
+        await db.execute(sql`ALTER TABLE "resources" DROP CONSTRAINT "resources_siteId_sites_siteId_fk";`);
+
+        await db.execute(sql`ALTER TABLE "clients" ALTER COLUMN "lastPing" TYPE integer USING NULL;`);
+
+        await db.execute(sql`ALTER TABLE "clientSites" ADD COLUMN "endpoint" varchar;`);
+
+        await db.execute(sql`ALTER TABLE "olms" ADD COLUMN "version" text;`);
+
+        await db.execute(sql`ALTER TABLE "orgs" ADD COLUMN "createdAt" text;`);
+
+        await db.execute(sql`ALTER TABLE "resources" ADD COLUMN "skipToIdpId" integer;`);
+
+        await db.execute(sql.raw(`ALTER TABLE "targets" ADD COLUMN "siteId" integer NOT NULL DEFAULT ${firstSiteId || 1};`));
+
+        await db.execute(sql`ALTER TABLE "siteResources" ADD CONSTRAINT "siteResources_siteId_sites_siteId_fk" FOREIGN KEY ("siteId") REFERENCES "public"."sites"("siteId") ON DELETE cascade ON UPDATE no action;`);
+
+        await db.execute(sql`ALTER TABLE "siteResources" ADD CONSTRAINT "siteResources_orgId_orgs_orgId_fk" FOREIGN KEY ("orgId") REFERENCES "public"."orgs"("orgId") ON DELETE cascade ON UPDATE no action;`);
+
+        await db.execute(sql`ALTER TABLE "resources" ADD CONSTRAINT "resources_skipToIdpId_idp_idpId_fk" FOREIGN KEY ("skipToIdpId") REFERENCES "public"."idp"("idpId") ON DELETE cascade ON UPDATE no action;`);
+
+        await db.execute(sql`ALTER TABLE "targets" ADD CONSTRAINT "targets_siteId_sites_siteId_fk" FOREIGN KEY ("siteId") REFERENCES "public"."sites"("siteId") ON DELETE cascade ON UPDATE no action;`);
+
+        await db.execute(sql`ALTER TABLE "clients" DROP COLUMN "endpoint";`);
+
+        await db.execute(sql`ALTER TABLE "resources" DROP COLUMN "siteId";`);
+
+        // for each resource, get all of its targets, and update the siteId to be the previously stored siteId
+        for (const [resourceId, siteId] of resourceSiteMap) {
+            const targets = await db.execute(sql`
+                SELECT "targetId" FROM "targets" WHERE "resourceId" = ${resourceId}
+            `);
+            for (const target of targets.rows) {
+                await db.execute(sql`
+                    UPDATE "targets" SET "siteId" = ${siteId} WHERE "targetId" = ${target.targetId}
+                `);
+            }
+        }
+
+        // list resources that have enableProxy false
+        // move them to the siteResources table
+        // remove them from the resources table
+        const proxyFalseResources = await db.execute(sql`
+            SELECT * FROM "resources" WHERE "enableProxy" = false
         `);
 
-        console.log(`Added setupTokens table`);
+        for (const resource of proxyFalseResources.rows) {
+            // Get the first target to derive destination IP and port
+            const firstTarget = await db.execute(sql`
+                SELECT "ip", "port" FROM "targets" WHERE "resourceId" = ${resource.resourceId} LIMIT 1
+            `);
+
+            if (firstTarget.rows.length === 0) {
+                continue;
+            }
+
+            const target = firstTarget.rows[0];
+
+            // Insert into siteResources table
+            await db.execute(sql`
+                INSERT INTO "siteResources" ("siteId", "orgId", "name", "protocol", "proxyPort", "destinationPort", "destinationIp", "enabled")
+                VALUES (${resourceSiteMap.get(resource.resourceId as number)}, ${resource.orgId}, ${resource.name}, ${resource.protocol}, ${resource.proxyPort}, ${target.port}, ${target.ip}, ${resource.enabled})
+            `);
+
+            // Delete from resources table
+            await db.execute(sql`
+                DELETE FROM "resources" WHERE "resourceId" = ${resource.resourceId}
+            `);
+
+            // Delete the targets for this resource
+            await db.execute(sql`
+                DELETE FROM "targets" WHERE "resourceId" = ${resource.resourceId}
+            `);
+        }
+
+        await db.execute(sql`COMMIT`);
+        console.log(`Migrated database`);
     } catch (e) {
-        console.log("Unable to add setupTokens table:", e);
+        await db.execute(sql`ROLLBACK`);
+        console.log("Failed to migrate db:", e);
         throw e;
     }
 }
diff --git a/server/setup/scriptsSqlite/1.9.0.ts b/server/setup/scriptsSqlite/1.9.0.ts
index 490f9585..502d7063 100644
--- a/server/setup/scriptsSqlite/1.9.0.ts
+++ b/server/setup/scriptsSqlite/1.9.0.ts
@@ -100,7 +100,7 @@ CREATE TABLE '__new_clients' (
 	FOREIGN KEY ('exitNode') REFERENCES 'exitNodes'('exitNodeId') ON UPDATE no action ON DELETE set null
 );
 --> statement-breakpoint
-INSERT INTO '__new_clients'("id", "orgId", "exitNode", "name", "pubKey", "subnet", "bytesIn", "bytesOut", "lastBandwidthUpdate", "lastPing", "type", "online", "lastHolePunch") SELECT "id", "orgId", "exitNode", "name", "pubKey", "subnet", "bytesIn", "bytesOut", "lastBandwidthUpdate", "lastPing", "type", "online", "lastHolePunch" FROM 'clients';--> statement-breakpoint
+INSERT INTO '__new_clients'("id", "orgId", "exitNode", "name", "pubKey", "subnet", "bytesIn", "bytesOut", "lastBandwidthUpdate", "lastPing", "type", "online", "lastHolePunch") SELECT "id", "orgId", "exitNode", "name", "pubKey", "subnet", "bytesIn", "bytesOut", "lastBandwidthUpdate", NULL, "type", "online", "lastHolePunch" FROM 'clients';--> statement-breakpoint
 DROP TABLE 'clients';--> statement-breakpoint
 ALTER TABLE '__new_clients' RENAME TO 'clients';--> statement-breakpoint
 ALTER TABLE 'clientSites' ADD 'endpoint' text;--> statement-breakpoint