diff --git a/next.config.ts b/next.config.ts
index 9d8aa9583..0c3738433 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -22,7 +22,21 @@ const nextConfig: NextConfig = {
     reactCompiler: true,
     transpilePackages: ["@novnc/novnc"],
     output: "standalone",
-    allowedDevOrigins
+    allowedDevOrigins,
+    async redirects() {
+        return [
+            {
+                source: "/:orgId/settings/resources/proxy/:path*",
+                destination: "/:orgId/settings/resources/public/:path*",
+                permanent: true
+            },
+            {
+                source: "/:orgId/settings/resources/client/:path*",
+                destination: "/:orgId/settings/resources/private/:path*",
+                permanent: true
+            }
+        ];
+    }
 };
 
 export default withNextIntl(nextConfig);
diff --git a/src/app/[orgId]/settings/logs/access/page.tsx b/src/app/[orgId]/settings/logs/access/page.tsx
index 267ad8556..a6cb87fc8 100644
--- a/src/app/[orgId]/settings/logs/access/page.tsx
+++ b/src/app/[orgId]/settings/logs/access/page.tsx
@@ -343,8 +343,8 @@ export default function GeneralPage() {
                     <Link
                         href={
                             row.original.type === "ssh"
-                                ? `/${row.original.orgId}/settings/resources/client?query=${row.original.resourceNiceId}`
-                                : `/${row.original.orgId}/settings/resources/proxy/${row.original.resourceNiceId}`
+                                ? `/${row.original.orgId}/settings/resources/private?query=${row.original.resourceNiceId}`
+                                : `/${row.original.orgId}/settings/resources/public/${row.original.resourceNiceId}`
                         }
                     >
                         <Button variant="outline" size="sm">
diff --git a/src/app/[orgId]/settings/logs/connection/page.tsx b/src/app/[orgId]/settings/logs/connection/page.tsx
index 125ccb118..be408edb1 100644
--- a/src/app/[orgId]/settings/logs/connection/page.tsx
+++ b/src/app/[orgId]/settings/logs/connection/page.tsx
@@ -325,7 +325,7 @@ export default function ConnectionLogsPage() {
                 if (row.original.resourceName && row.original.resourceNiceId) {
                     return (
                         <Link
-                            href={`/${row.original.orgId}/settings/resources/client/?query=${row.original.resourceNiceId}`}
+                            href={`/${row.original.orgId}/settings/resources/private/?query=${row.original.resourceNiceId}`}
                         >
                             <Button variant="outline" size="sm">
                                 {row.original.resourceName}
diff --git a/src/app/[orgId]/settings/logs/request/page.tsx b/src/app/[orgId]/settings/logs/request/page.tsx
index 2196a0342..ae11da78a 100644
--- a/src/app/[orgId]/settings/logs/request/page.tsx
+++ b/src/app/[orgId]/settings/logs/request/page.tsx
@@ -400,8 +400,8 @@ export default function GeneralPage() {
                     <Link
                         href={
                             row.original.reason == 108 // for now the client will only have reason 108 so we know where to go
-                                ? `/${row.original.orgId}/settings/resources/client?query=${row.original.resourceNiceId}`
-                                : `/${row.original.orgId}/settings/resources/proxy/${row.original.resourceNiceId}`
+                                ? `/${row.original.orgId}/settings/resources/private?query=${row.original.resourceNiceId}`
+                                : `/${row.original.orgId}/settings/resources/public/${row.original.resourceNiceId}`
                         }
                         onClick={(e) => e.stopPropagation()}
                     >
diff --git a/src/app/[orgId]/settings/resources/page.tsx b/src/app/[orgId]/settings/resources/page.tsx
index 55ebe6554..ef5639bef 100644
--- a/src/app/[orgId]/settings/resources/page.tsx
+++ b/src/app/[orgId]/settings/resources/page.tsx
@@ -11,5 +11,5 @@ export interface ResourcesPageProps {
 
 export default async function ResourcesPage(props: ResourcesPageProps) {
     const params = await props.params;
-    redirect(`/${params.orgId}/settings/resources/proxy`);
+    redirect(`/${params.orgId}/settings/resources/public`);
 }
diff --git a/src/app/[orgId]/settings/resources/client/page.tsx b/src/app/[orgId]/settings/resources/private/page.tsx
similarity index 97%
rename from src/app/[orgId]/settings/resources/client/page.tsx
rename to src/app/[orgId]/settings/resources/private/page.tsx
index ce42f39c9..f90bc91c7 100644
--- a/src/app/[orgId]/settings/resources/client/page.tsx
+++ b/src/app/[orgId]/settings/resources/private/page.tsx
@@ -1,5 +1,5 @@
-import type { InternalResourceRow } from "@app/components/ClientResourcesTable";
-import PrivateResourcesTable from "@app/components/ClientResourcesTable";
+import type { InternalResourceRow } from "@app/components/PrivateResourcesTable";
+import PrivateResourcesTable from "@app/components/PrivateResourcesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import PrivateResourcesBanner from "@app/components/PrivateResourcesBanner";
 import { internal } from "@app/lib/api";
diff --git a/src/app/[orgId]/settings/resources/proxy/ProxyResourceTargetsForm.tsx b/src/app/[orgId]/settings/resources/public/ProxyResourceTargetsForm.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/ProxyResourceTargetsForm.tsx
rename to src/app/[orgId]/settings/resources/public/ProxyResourceTargetsForm.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/authentication/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/authentication/page.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/general/page.tsx
similarity index 99%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/general/page.tsx
index 848f8c29d..f53afd056 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/resources/public/[niceId]/general/page.tsx
@@ -548,7 +548,7 @@ export default function GeneralForm() {
 
             if (data.niceId && data.niceId !== resource?.niceId) {
                 router.replace(
-                    `/${updated.orgId}/settings/resources/proxy/${data.niceId}/general`
+                    `/${updated.orgId}/settings/resources/public/${data.niceId}/general`
                 );
             }
 
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/http/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/http/page.tsx
similarity index 95%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/http/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/http/page.tsx
index 21f18a217..c65ddb9b2 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/http/page.tsx
+++ b/src/app/[orgId]/settings/resources/public/[niceId]/http/page.tsx
@@ -39,69 +39,27 @@ import {
     FormLabel,
     FormMessage
 } from "@app/components/ui/form";
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow
-} from "@app/components/ui/table";
-import {
-    Tooltip,
-    TooltipContent,
-    TooltipProvider,
-    TooltipTrigger
-} from "@app/components/ui/tooltip";
 import type { ResourceContextType } from "@app/contexts/resourceContext";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useResourceContext } from "@app/hooks/useResourceContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient } from "@app/lib/api";
 import { formatAxiosError } from "@app/lib/api/formatAxiosError";
-import { DockerManager, DockerState } from "@app/lib/docker";
-import { orgQueries, resourceQueries } from "@app/lib/queries";
+import { resourceQueries } from "@app/lib/queries";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { build } from "@server/build";
 import { tlsNameSchema } from "@server/lib/schemas";
-import { type GetResourceResponse } from "@server/routers/resource";
-import type { ListSitesResponse } from "@server/routers/site";
-import { CreateTargetResponse } from "@server/routers/target";
-import { ListTargetsResponse } from "@server/routers/target/listTargets";
-import { ArrayElement } from "@server/types/ArrayElement";
 import { useQuery } from "@tanstack/react-query";
 import {
-    LocalTarget,
     ProxyResourceTargetsForm
-} from "@app/app/[orgId]/settings/resources/proxy/ProxyResourceTargetsForm";
-import {
-    ColumnDef,
-    flexRender,
-    getCoreRowModel,
-    getFilteredRowModel,
-    getPaginationRowModel,
-    getSortedRowModel,
-    useReactTable
-} from "@tanstack/react-table";
-import { AxiosResponse } from "axios";
+} from "@app/app/[orgId]/settings/resources/public/ProxyResourceTargetsForm";
 import {
     AlertTriangle,
-    CircleCheck,
-    CircleX,
-    ExternalLink,
-    Info,
-    Plus,
-    Settings
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
 import {
     use,
     useActionState,
-    useCallback,
-    useEffect,
-    useMemo,
-    useState
 } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/layout.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx
similarity index 92%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/layout.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx
index 56ddb1460..98e38668b 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/layout.tsx
+++ b/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx
@@ -83,22 +83,22 @@ export default async function ResourceLayout(props: ResourceLayoutProps) {
     const navItems = [
         {
             title: t("general"),
-            href: `/{orgId}/settings/resources/proxy/{niceId}/general`
+            href: `/{orgId}/settings/resources/public/{niceId}/general`
         },
         {
             title: t(`${resource.mode}Settings`),
-            href: `/{orgId}/settings/resources/proxy/{niceId}/${resource.mode}`
+            href: `/{orgId}/settings/resources/public/{niceId}/${resource.mode}`
         }
     ];
 
     if (["http", "ssh", "rdp", "vnc"].includes(resource.mode)) {
         navItems.push({
             title: t("authentication"),
-            href: `/{orgId}/settings/resources/proxy/{niceId}/authentication`
+            href: `/{orgId}/settings/resources/public/{niceId}/authentication`
         });
         // navItems.push({
         //     title: t("rules"),
-        //     href: `/{orgId}/settings/resources/proxy/{niceId}/rules`
+        //     href: `/{orgId}/settings/resources/public/{niceId}/rules`
         // });
     }
 
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/page.tsx
similarity index 80%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/page.tsx
index 10950bfca..8dbb5f07e 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/page.tsx
+++ b/src/app/[orgId]/settings/resources/public/[niceId]/page.tsx
@@ -10,6 +10,6 @@ export default async function ResourcePage(props: {
 }) {
     const params = await props.params;
     redirect(
-        `/${params.orgId}/settings/resources/proxy/${params.niceId}/general`
+        `/${params.orgId}/settings/resources/public/${params.niceId}/general`
     );
 }
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/rdp/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/rdp/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/rdp/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/rdp/page.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/rules/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/rules/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/rules/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/rules/page.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/ssh/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/ssh/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/ssh/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/ssh/page.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/vnc/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/vnc/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/[niceId]/vnc/page.tsx
rename to src/app/[orgId]/settings/resources/public/[niceId]/vnc/page.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/create/layout.tsx b/src/app/[orgId]/settings/resources/public/create/layout.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/create/layout.tsx
rename to src/app/[orgId]/settings/resources/public/create/layout.tsx
diff --git a/src/app/[orgId]/settings/resources/proxy/create/page.tsx b/src/app/[orgId]/settings/resources/public/create/page.tsx
similarity index 99%
rename from src/app/[orgId]/settings/resources/proxy/create/page.tsx
rename to src/app/[orgId]/settings/resources/public/create/page.tsx
index afd739513..a28303669 100644
--- a/src/app/[orgId]/settings/resources/proxy/create/page.tsx
+++ b/src/app/[orgId]/settings/resources/public/create/page.tsx
@@ -89,7 +89,7 @@ import { useQuery } from "@tanstack/react-query";
 import {
     LocalTarget,
     ProxyResourceTargetsForm
-} from "@app/app/[orgId]/settings/resources/proxy/ProxyResourceTargetsForm";
+} from "@app/app/[orgId]/settings/resources/public/ProxyResourceTargetsForm";
 import {
     ColumnDef,
     flexRender,
@@ -514,7 +514,7 @@ export default function Page() {
                         }
                     }
                     router.push(
-                        `/${orgId}/settings/resources/proxy/${newNiceId}`
+                        `/${orgId}/settings/resources/public/${newNiceId}`
                     );
                 } else if (resourceType === "ssh") {
                     if (isNative) {
@@ -550,7 +550,7 @@ export default function Page() {
                     }
 
                     router.push(
-                        `/${orgId}/settings/resources/proxy/${newNiceId}`
+                        `/${orgId}/settings/resources/public/${newNiceId}`
                     );
                 } else if (resourceType === "rdp" || resourceType === "vnc") {
                     for (const site of bgSelectedSites) {
@@ -566,7 +566,7 @@ export default function Page() {
                     }
 
                     router.push(
-                        `/${orgId}/settings/resources/proxy/${newNiceId}`
+                        `/${orgId}/settings/resources/public/${newNiceId}`
                     );
                 } else {
                     // TCP / UDP — create targets then show snippets
@@ -1308,7 +1308,7 @@ export default function Page() {
                                     type="button"
                                     onClick={() =>
                                         router.push(
-                                            `/${orgId}/settings/resources/proxy/${niceId}`
+                                            `/${orgId}/settings/resources/public/${niceId}`
                                         )
                                     }
                                 >
diff --git a/src/app/[orgId]/settings/resources/proxy/page.tsx b/src/app/[orgId]/settings/resources/public/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/proxy/page.tsx
rename to src/app/[orgId]/settings/resources/public/page.tsx
diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx
index 57e10a5c9..566d17d0d 100644
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -71,12 +71,12 @@ export const orgNavSections = (
                 items: [
                     {
                         title: "sidebarProxyResources",
-                        href: "/{orgId}/settings/resources/proxy",
+                        href: "/{orgId}/settings/resources/public",
                         icon: <Globe className="size-4 flex-none" />
                     },
                     {
                         title: "sidebarClientResources",
-                        href: "/{orgId}/settings/resources/client",
+                        href: "/{orgId}/settings/resources/private",
                         icon: <GlobeLock className="size-4 flex-none" />
                     }
                 ]
diff --git a/src/components/HealthChecksTable.tsx b/src/components/HealthChecksTable.tsx
index b4962ecd1..02e725fed 100644
--- a/src/components/HealthChecksTable.tsx
+++ b/src/components/HealthChecksTable.tsx
@@ -406,7 +406,7 @@ export default function HealthChecksTable({
                 }
                 return (
                     <Link
-                        href={`/${orgId}/settings/resources/proxy/${r.resourceNiceId}`}
+                        href={`/${orgId}/settings/resources/public/${r.resourceNiceId}`}
                     >
                         <Button variant="outline" size="sm">
                             {r.resourceName}
@@ -627,7 +627,7 @@ export default function HealthChecksTable({
                         </DropdownMenu>
                         {r.resourceId && r.resourceName && r.resourceNiceId ? (
                             <Link
-                                href={`/${orgId}/settings/resources/proxy/${r.resourceNiceId}`}
+                                href={`/${orgId}/settings/resources/public/${r.resourceNiceId}`}
                             >
                                 <Button variant="outline" disabled={!isPaid}>
                                     {t("edit")}
diff --git a/src/components/ProxyResourcesTable.tsx b/src/components/ProxyResourcesTable.tsx
index 630d58408..80d2e9d25 100644
--- a/src/components/ProxyResourcesTable.tsx
+++ b/src/components/ProxyResourcesTable.tsx
@@ -609,7 +609,7 @@ export default function ProxyResourcesTable({
                                 <DropdownMenuContent align="end">
                                     <Link
                                         className="block w-full"
-                                        href={`/${resourceRow.orgId}/settings/resources/proxy/${resourceRow.nice}`}
+                                        href={`/${resourceRow.orgId}/settings/resources/public/${resourceRow.nice}`}
                                     >
                                         <DropdownMenuItem>
                                             {t("viewSettings")}
@@ -628,7 +628,7 @@ export default function ProxyResourcesTable({
                                 </DropdownMenuContent>
                             </DropdownMenu>
                             <Link
-                                href={`/${resourceRow.orgId}/settings/resources/proxy/${resourceRow.nice}`}
+                                href={`/${resourceRow.orgId}/settings/resources/public/${resourceRow.nice}`}
                             >
                                 <Button variant={"outline"}>
                                     {t("edit")}
@@ -744,7 +744,9 @@ export default function ProxyResourcesTable({
                 onPaginationChange={handlePaginationChange}
                 onAdd={() =>
                     startNavigation(() =>
-                        router.push(`/${orgId}/settings/resources/proxy/create`)
+                        router.push(
+                            `/${orgId}/settings/resources/public/create`
+                        )
                     )
                 }
                 addButtonText={t("resourceAdd")}
diff --git a/src/components/ShareLinksTable.tsx b/src/components/ShareLinksTable.tsx
index 239a12cc8..8394edf89 100644
--- a/src/components/ShareLinksTable.tsx
+++ b/src/components/ShareLinksTable.tsx
@@ -145,7 +145,7 @@ export default function ShareLinksTable({
                 const r = row.original;
                 return (
                     <Link
-                        href={`/${orgId}/settings/resources/proxy/${r.resourceNiceId}`}
+                        href={`/${orgId}/settings/resources/public/${r.resourceNiceId}`}
                     >
                         <Button variant="outline" size="sm">
                             {r.resourceName}
@@ -328,9 +328,7 @@ export default function ShareLinksTable({
                     onConfirm={async () =>
                         deleteSharelink(selectedLink.accessTokenId)
                     }
-                    string={
-                        selectedLink.title || selectedLink.resourceName
-                    }
+                    string={selectedLink.title || selectedLink.resourceName}
                     title={t("shareDelete")}
                 />
             )}
diff --git a/src/components/SiteResourcesOverview.tsx b/src/components/SiteResourcesOverview.tsx
index 07737f34c..6502f331a 100644
--- a/src/components/SiteResourcesOverview.tsx
+++ b/src/components/SiteResourcesOverview.tsx
@@ -421,15 +421,15 @@ export default function SiteResourcesOverview({
         publicList.length === 0 &&
         privateList.length === 0;
 
-    const publicViewAllHref = `/${orgId}/settings/resources/proxy?siteId=${siteId}`;
-    const privateViewAllHref = `/${orgId}/settings/resources/client?siteId=${siteId}`;
+    const publicViewAllHref = `/${orgId}/settings/resources/public?siteId=${siteId}`;
+    const privateViewAllHref = `/${orgId}/settings/resources/private?siteId=${siteId}`;
 
     const publicRows = publicList.map((r) => ({
         key: r.resourceId,
         meta: <PublicResourceMeta resource={r} />,
         name: r.name,
         access: <PublicAccessMethod resource={r} />,
-        editHref: `/${orgId}/settings/resources/proxy/${r.niceId}`
+        editHref: `/${orgId}/settings/resources/public/${r.niceId}`
     }));
 
     const privateRows = privateList.map((row) => {
@@ -442,7 +442,7 @@ export default function SiteResourcesOverview({
             meta: <PrivateResourceMeta row={row} />,
             name: row.name,
             access: <PrivateAccessMethod row={row} />,
-            editHref: `/${orgId}/settings/resources/client?${qs.toString()}`
+            editHref: `/${orgId}/settings/resources/private?${qs.toString()}`
         };
     });
 
diff --git a/src/components/SitesTable.tsx b/src/components/SitesTable.tsx
index 51172a9e0..aac422de9 100644
--- a/src/components/SitesTable.tsx
+++ b/src/components/SitesTable.tsx
@@ -506,7 +506,7 @@ export default function SitesTable({
                                     </Link>
                                     <Link
                                         className="block w-full"
-                                        href={`/${siteRow.orgId}/settings/resources/proxy?siteId=${siteRow.id}`}
+                                        href={`/${siteRow.orgId}/settings/resources/public?siteId=${siteRow.id}`}
                                     >
                                         <DropdownMenuItem>
                                             {t("sitesTableViewPublicResources")}
@@ -514,7 +514,7 @@ export default function SitesTable({
                                     </Link>
                                     <Link
                                         className="block w-full"
-                                        href={`/${siteRow.orgId}/settings/resources/client?siteId=${siteRow.id}`}
+                                        href={`/${siteRow.orgId}/settings/resources/private?siteId=${siteRow.id}`}
                                     >
                                         <DropdownMenuItem>
                                             {t(