diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/ApprovalCheck.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx
similarity index 92%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/ApprovalCheck.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx
index 9eecd4013..85f316f00 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/ApprovalCheck.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx
@@ -1,6 +1,6 @@
 import { Button } from "@ctrlplane/ui/button";
 
-import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ApprovalDialog";
+import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog";
 import { api } from "~/trpc/react";
 import { Cancelled, Failing, Loading, Passing, Waiting } from "./StatusIcons";
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/EnvironmentNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/EnvironmentNode.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowDiagram.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowDiagram.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowNode.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowPolicyNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/FlowPolicyNode.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/StatusIcons.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/StatusIcons.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/TriggerNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/flow-diagram/TriggerNode.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx
similarity index 97%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx
index 4ae8ddb63..2477c8ba2 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx
@@ -7,7 +7,7 @@ import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 import { ReactFlowProvider } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/ReactFlowProvider";
 import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
-import { FlowDiagram } from "./flow-diagram/FlowDiagram";
+import { FlowDiagram } from "./_components/flow-diagram/FlowDiagram";
 
 type PageProps = {
   params: Promise<{
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx
similarity index 89%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx
index 0bcc87e32..c6aaed005 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx
@@ -4,7 +4,7 @@ import type { EnvironmentPolicyApproval, User } from "@ctrlplane/db/schema";
 
 import { Button } from "@ctrlplane/ui/button";
 
-import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ApprovalDialog";
+import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog";
 
 type EnvironmentApprovalRowProps = {
   approval: EnvironmentPolicyApproval & { user?: User | null };
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx
similarity index 95%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx
index 272b9b083..70eaa0c31 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx
@@ -5,7 +5,7 @@ import { usePathname } from "next/navigation";
 
 import { Button } from "@ctrlplane/ui/button";
 
-import { CreateReleaseDialog } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/CreateRelease";
+import { CreateReleaseDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease";
 import { CreateReleaseChannelDialog } from "../channels/CreateReleaseChannelDialog";
 import { CreateVariableDialog } from "../variables/CreateVariableDialog";
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeploymentPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeploymentPageContent.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeploymentPageContent.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeploymentPageContent.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx
similarity index 97%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx
index d7f07764e..a784c0596 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx
@@ -11,7 +11,7 @@ import { JobStatus } from "@ctrlplane/validators/jobs";
 import { ReleaseStatus } from "@ctrlplane/validators/releases";
 
 import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(app)/_components/release-channel-drawer/useReleaseChannelDrawer";
-import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ApprovalDialog";
+import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog";
 import { api } from "~/trpc/react";
 import { DeployButton } from "./DeployButton";
 import { Release } from "./TableCells";
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx
similarity index 97%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx
index 21b14f2c2..2a9ba93f0 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx
@@ -39,12 +39,12 @@ import {
   JobStatus,
 } from "@ctrlplane/validators/jobs";
 
-import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/charts/DeploymentBarChart";
-import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ReleaseDropdownMenu";
+import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart";
+import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu";
 import {
   getStatusColor,
   statusColor,
-} from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_utils/status-color";
+} from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color";
 import { api } from "~/trpc/react";
 
 const ReleaseIcon: React.FC<{
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx
new file mode 100644
index 000000000..275dc82ca
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx
@@ -0,0 +1,57 @@
+"use client";
+
+import type * as SCHEMA from "@ctrlplane/db/schema";
+import { useParams } from "next/navigation";
+import { IconMenu2 } from "@tabler/icons-react";
+
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+} from "@ctrlplane/ui/breadcrumb";
+import { Separator } from "@ctrlplane/ui/separator";
+import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
+
+import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
+import { urls } from "~/app/urls";
+
+type SystemBreadcrumbProps = {
+  system: SCHEMA.System;
+  page: string;
+};
+
+export const SystemBreadcrumb: React.FC<SystemBreadcrumbProps> = ({
+  system,
+  page,
+}) => {
+  const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
+  const workspaceUrls = urls.workspace(workspaceSlug);
+  const systemsUrl = workspaceUrls.systems();
+  const systemUrl = workspaceUrls.system(system.slug).baseUrl();
+  return (
+    <div className="flex items-center gap-2">
+      <SidebarTrigger name={Sidebars.System}>
+        <IconMenu2 className="h-4 w-4" />
+      </SidebarTrigger>
+      <Separator orientation="vertical" className="mr-2 h-4" />
+      <Breadcrumb>
+        <BreadcrumbList>
+          <BreadcrumbItem className="hidden md:block">
+            <BreadcrumbLink href={systemsUrl}>Systems</BreadcrumbLink>
+          </BreadcrumbItem>
+          <BreadcrumbSeparator />
+          <BreadcrumbItem className="hidden md:block">
+            <BreadcrumbLink href={systemUrl}>{system.name}</BreadcrumbLink>
+          </BreadcrumbItem>
+          <BreadcrumbSeparator />
+          <BreadcrumbItem className="hidden md:block">
+            <BreadcrumbPage>{page}</BreadcrumbPage>
+          </BreadcrumbItem>
+        </BreadcrumbList>
+      </Breadcrumb>
+    </div>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx
similarity index 96%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx
index 284ea0e12..9493c1fa9 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx
@@ -8,8 +8,8 @@ import { IconLoader2 } from "@tabler/icons-react";
 import { cn } from "@ctrlplane/ui";
 import { Badge } from "@ctrlplane/ui/badge";
 
-import { DeploymentOptionsDropdown } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/DeploymentOptionsDropdown";
-import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/DeploymentEnvironmentCell";
+import { DeploymentOptionsDropdown } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown";
+import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell";
 import { urls } from "~/app/urls";
 import { api } from "~/trpc/react";
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx
similarity index 64%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx
index 4fc93354f..85446af8a 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/deployments/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx
@@ -1,20 +1,11 @@
 import { notFound } from "next/navigation";
-import { IconMenu2 } from "@tabler/icons-react";
 
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
 import { Button } from "@ctrlplane/ui/button";
-import { Separator } from "@ctrlplane/ui/separator";
-import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
 import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment";
 import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
-import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
+import { SystemBreadcrumb } from "../_components/SystemBreadcrumb";
 import DeploymentTable from "./TableDeployments";
 
 export default async function EnvironmentsPage(props: {
@@ -36,19 +27,7 @@ export default async function EnvironmentsPage(props: {
   return (
     <div className="flex min-w-0 flex-col overflow-x-auto">
       <PageHeader className="flex items-center justify-between">
-        <div className="flex items-center gap-2">
-          <SidebarTrigger name={Sidebars.System}>
-            <IconMenu2 className="h-4 w-4" />
-          </SidebarTrigger>
-          <Separator orientation="vertical" className="mr-2 h-4" />
-          <Breadcrumb>
-            <BreadcrumbList>
-              <BreadcrumbItem className="hidden md:block">
-                <BreadcrumbPage>Deployments</BreadcrumbPage>
-              </BreadcrumbItem>
-            </BreadcrumbList>
-          </Breadcrumb>
-        </div>
+        <SystemBreadcrumb system={system} page="Deployments" />
 
         <CreateDeploymentDialog systemId={system.id}>
           <Button
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx
similarity index 50%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx
index cd620a734..a9dc7e547 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/environments/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx
@@ -1,18 +1,8 @@
 import { notFound } from "next/navigation";
-import { IconMenu2 } from "@tabler/icons-react";
-
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
-import { Separator } from "@ctrlplane/ui/separator";
-import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
 import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
-import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
+import { SystemBreadcrumb } from "../_components/SystemBreadcrumb";
 import { EnvironmentRow } from "./EnvironmentRow";
 
 export default async function EnvironmentsPage(props: {
@@ -27,17 +17,7 @@ export default async function EnvironmentsPage(props: {
   return (
     <div>
       <PageHeader>
-        <SidebarTrigger name={Sidebars.System}>
-          <IconMenu2 className="h-4 w-4" />
-        </SidebarTrigger>
-        <Separator orientation="vertical" className="mr-2 h-4" />
-        <Breadcrumb>
-          <BreadcrumbList>
-            <BreadcrumbItem className="hidden md:block">
-              <BreadcrumbPage>Environments</BreadcrumbPage>
-            </BreadcrumbItem>
-          </BreadcrumbList>
-        </Breadcrumb>
+        <SystemBreadcrumb system={system} page="Environments" />
       </PageHeader>
 
       {environments.map((environment) => (
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx
similarity index 95%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/layout.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx
index 70e6d4fad..18eac0e26 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/layout.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx
@@ -19,10 +19,10 @@ import {
   SidebarProvider,
 } from "@ctrlplane/ui/sidebar";
 
+import { SystemSelector } from "~/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector";
+import { SidebarLink } from "~/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink";
 import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
-import { SidebarLink } from "../../../resources/(sidebar)/SidebarLink";
-import { SystemSelector } from "../../SystemSelector";
 
 export const generateMetadata = async (props: {
   params: Promise<{ workspaceSlug: string; systemSlug: string }>;
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/edges.ts b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/edges.ts
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx
similarity index 64%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx
index 3540d60a2..c447ea320 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx
@@ -1,20 +1,11 @@
 import Link from "next/link";
 import { notFound } from "next/navigation";
-import { IconMenu2 } from "@tabler/icons-react";
 
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
 import { buttonVariants } from "@ctrlplane/ui/button";
-import { Separator } from "@ctrlplane/ui/separator";
-import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
 import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
-import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
+import { SystemBreadcrumb } from "../_components/SystemBreadcrumb";
 import { RunbookGettingStarted } from "./RunbookGettingStarted";
 import { RunbookRow } from "./RunbookRow";
 
@@ -30,19 +21,7 @@ export default async function RunbooksPage(props: {
   return (
     <div>
       <PageHeader className="flex w-full items-center justify-between">
-        <div className="flex items-center gap-2">
-          <SidebarTrigger name={Sidebars.System}>
-            <IconMenu2 className="h-4 w-4" />
-          </SidebarTrigger>
-          <Separator orientation="vertical" className="mr-2 h-4" />
-          <Breadcrumb>
-            <BreadcrumbList>
-              <BreadcrumbItem className="hidden md:block">
-                <BreadcrumbPage>Runbooks</BreadcrumbPage>
-              </BreadcrumbItem>
-            </BreadcrumbList>
-          </Breadcrumb>
-        </div>
+        <SystemBreadcrumb system={system} page="Runbooks" />
 
         <Link
           href={`/${params.workspaceSlug}/systems/${params.systemSlug}/runbooks/create`}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx
similarity index 67%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx
index 806e35524..7b66281da 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/settings/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx
@@ -1,20 +1,12 @@
 import { notFound } from "next/navigation";
-import { IconMenu2 } from "@tabler/icons-react";
 
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
 import { Button } from "@ctrlplane/ui/button";
 import { Separator } from "@ctrlplane/ui/separator";
-import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
 import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
 import { DeleteSystemDialog } from "~/app/[workspaceSlug]/(appv2)/_components/system/DeleteSystemDialog";
-import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
+import { SystemBreadcrumb } from "../_components/SystemBreadcrumb";
 import { GeneralSettings } from "./GeneralSettings";
 
 export default async function SystemSettingsPage(props: {
@@ -25,17 +17,7 @@ export default async function SystemSettingsPage(props: {
   return (
     <div className="flex flex-col">
       <PageHeader>
-        <SidebarTrigger name={Sidebars.System}>
-          <IconMenu2 className="h-4 w-4" />
-        </SidebarTrigger>
-        <Separator orientation="vertical" className="mr-2 h-4" />
-        <Breadcrumb>
-          <BreadcrumbList>
-            <BreadcrumbItem className="hidden md:block">
-              <BreadcrumbPage>Settings</BreadcrumbPage>
-            </BreadcrumbItem>
-          </BreadcrumbList>
-        </Breadcrumb>
+        <SystemBreadcrumb system={system} page="Settings" />
       </PageHeader>
 
       <div className="container max-w-2xl space-y-8 overflow-y-auto py-8">
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx
new file mode 100644
index 000000000..48571ae02
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx
@@ -0,0 +1,37 @@
+import { notFound } from "next/navigation";
+
+import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
+import { api } from "~/trpc/server";
+import { SystemBreadcrumb } from "../_components/SystemBreadcrumb";
+import { VariableSetGettingStarted } from "./GettingStartedVariableSets";
+import { VariableSetsTable } from "./VariableSetsTable";
+
+export default async function SystemVariableSetsPage(props: {
+  params: Promise<{ workspaceSlug: string; systemSlug: string }>;
+}) {
+  const params = await props.params;
+  const workspace = await api.workspace
+    .bySlug(params.workspaceSlug)
+    .catch(() => notFound());
+  if (!workspace) notFound();
+  const system = await api.system.bySlug(params).catch(() => notFound());
+
+  const variableSets = await api.variableSet.bySystemId(system.id);
+  return (
+    <div>
+      <PageHeader>
+        <SystemBreadcrumb system={system} page="Variables" />
+      </PageHeader>
+
+      {variableSets.length === 0 && (
+        <VariableSetGettingStarted
+          systemId={system.id}
+          environments={system.environments}
+        />
+      )}
+      {variableSets.length !== 0 && (
+        <VariableSetsTable variableSets={variableSets} />
+      )}
+    </div>
+  );
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx
similarity index 52%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/deployments/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx
index 5adadec15..f357876fa 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/deployments/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx
@@ -1,11 +1,15 @@
 import type { Metadata } from "next";
 import { notFound } from "next/navigation";
+import { IconMenu2 } from "@tabler/icons-react";
 
 import { Button } from "@ctrlplane/ui/button";
+import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
+import { DeploymentsCard } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/Card";
+import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment";
+import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
+import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
 import { api } from "~/trpc/server";
-import { DeploymentsCard } from "../_components/deployments/Card";
-import { CreateDeploymentDialog } from "../_components/deployments/CreateDeployment";
 
 export const metadata: Metadata = {
   title: "Deployments | Ctrlplane",
@@ -21,15 +25,18 @@ export default async function DeploymentsPage(props: Props) {
   if (workspace == null) notFound();
 
   return (
-    <div className="container m-8 mx-auto space-y-8">
-      <div className="flex w-full justify-between">
-        <h2 className="text-2xl font-bold">Deployments</h2>
+    <div className="flex flex-col">
+      <PageHeader className="z-10 flex items-center justify-between">
+        <SidebarTrigger name={Sidebars.Deployments}>
+          <IconMenu2 className="h-4 w-4" />
+        </SidebarTrigger>
         <CreateDeploymentDialog>
           <Button variant="outline" size="sm">
             Create Deployment
           </Button>
         </CreateDeploymentDialog>
-      </div>
+      </PageHeader>
+
       <DeploymentsCard workspaceId={workspace.id} />
     </div>
   );
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/layout.tsx
new file mode 100644
index 000000000..3c1f1f643
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/layout.tsx
@@ -0,0 +1,53 @@
+import { notFound } from "next/navigation";
+import { IconCategory, IconRocket } from "@tabler/icons-react";
+
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarGroup,
+  SidebarInset,
+  SidebarMenu,
+  SidebarProvider,
+} from "@ctrlplane/ui/sidebar";
+
+import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
+import { api } from "~/trpc/server";
+import { urls } from "../../../../urls";
+import { SidebarLink } from "../../resources/(sidebar)/SidebarLink";
+
+export default async function Layout(props: {
+  children: React.ReactNode;
+  params: Promise<{ workspaceSlug: string }>;
+}) {
+  const { workspaceSlug } = await props.params;
+  const workspace = await api.workspace.bySlug(workspaceSlug);
+  if (workspace == null) notFound();
+
+  const workspaceUrls = urls.workspace(workspaceSlug);
+  const deploymentsUrl = workspaceUrls.deployments();
+  const systemsUrl = workspaceUrls.systems();
+
+  return (
+    <div className="relative">
+      <SidebarProvider sidebarNames={[Sidebars.Deployments]}>
+        <Sidebar className="absolute left-0 top-0" name={Sidebars.Deployments}>
+          <SidebarContent>
+            <SidebarGroup>
+              <SidebarMenu>
+                <SidebarLink icon={<IconCategory />} href={systemsUrl}>
+                  Systems
+                </SidebarLink>
+                <SidebarLink icon={<IconRocket />} href={deploymentsUrl}>
+                  Deployments
+                </SidebarLink>
+              </SidebarMenu>
+            </SidebarGroup>
+          </SidebarContent>
+        </Sidebar>
+        <SidebarInset className="scrollbar-thin scrollbar-thumb-neutral-700 scrollbar-track-neutral-800 h-[calc(100vh-56px-2px)] overflow-y-auto">
+          {props.children}
+        </SidebarInset>
+      </SidebarProvider>
+    </div>
+  );
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/CreateSystem.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/CreateSystem.tsx
new file mode 100644
index 000000000..4a2851610
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/CreateSystem.tsx
@@ -0,0 +1,142 @@
+"use client";
+
+import type { Workspace } from "@ctrlplane/db/schema";
+import React, { useState } from "react";
+import { useRouter } from "next/navigation";
+import slugify from "slugify";
+import { z } from "zod";
+
+import { systemSchema } from "@ctrlplane/db/schema";
+import { Button } from "@ctrlplane/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@ctrlplane/ui/dialog";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  FormRootError,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+import { Textarea } from "@ctrlplane/ui/textarea";
+
+import { api } from "~/trpc/react";
+
+const systemForm = z.object(systemSchema.shape);
+
+export const CreateSystemDialog: React.FC<{
+  children: React.ReactNode;
+  workspace: Workspace;
+  onSuccess?: () => void;
+}> = ({ children, workspace, onSuccess }) => {
+  const [open, setOpen] = useState(false);
+  const createSystem = api.system.create.useMutation();
+  const router = useRouter();
+
+  const form = useForm({
+    schema: systemForm,
+    defaultValues: { name: "", slug: "", description: "" },
+    mode: "onSubmit",
+  });
+
+  const { handleSubmit, watch, setValue, setError } = form;
+
+  watch((data, { name: fieldName }) => {
+    if (fieldName === "name")
+      setValue("slug", slugify(data.name ?? "", { lower: true }));
+  });
+
+  const errMsg = "System with this slug already exists";
+  const onSubmit = handleSubmit((system) =>
+    createSystem
+      .mutateAsync({ workspaceId: workspace.id, ...system })
+      .then(() => router.refresh())
+      .then(() => router.push(`/${workspace.slug}/systems/${system.slug}`))
+      .then(() => onSuccess?.())
+      .then(() => setOpen(false))
+      .catch(() => setError("root", { message: errMsg })),
+  );
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
+      <DialogContent>
+        <Form {...form}>
+          <form onSubmit={onSubmit} className="space-y-3">
+            <DialogHeader>
+              <DialogTitle>New System</DialogTitle>
+              <DialogDescription>
+                Systems are a group of processes, releases, and runbooks for
+                applications or services.
+              </DialogDescription>
+            </DialogHeader>
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="Identity Services, Payment Services..."
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="slug"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Slug</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="identity-services, payment-services..."
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Description</FormLabel>
+                  <FormControl>
+                    <Textarea
+                      placeholder="Describe your system..."
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormRootError />
+            <DialogFooter>
+              <Button type="submit" disabled={createSystem.isPending}>
+                Create system
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/SystemSelector.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/SystemSelector.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/SystemsPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx
similarity index 53%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/SystemsPageContent.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx
index 5524abb5b..e3e51f639 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/SystemsPageContent.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx
@@ -3,15 +3,26 @@
 import type * as SCHEMA from "@ctrlplane/db/schema";
 import { useEffect, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
+import { IconMenu2 } from "@tabler/icons-react";
 
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbList,
+  BreadcrumbPage,
+} from "@ctrlplane/ui/breadcrumb";
 import { Button } from "@ctrlplane/ui/button";
 import { Input } from "@ctrlplane/ui/input";
+import { Separator } from "@ctrlplane/ui/separator";
+import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
 
+import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment";
+import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
 import { api } from "~/trpc/react";
-import { CreateDeploymentDialog } from "../_components/deployments/CreateDeployment";
-import { CreateSystemDialog } from "../../(app)/_components/CreateSystem";
+import { Sidebars } from "../../../../sidebars";
 import { SystemDeploymentSkeleton } from "./_components/system-deployment-table/SystemDeploymentSkeleton";
 import { SystemDeploymentTable } from "./_components/system-deployment-table/SystemDeploymentTable";
+import { CreateSystemDialog } from "./CreateSystem";
 
 const useSystemFilter = () => {
   const router = useRouter();
@@ -55,9 +66,22 @@ export const SystemsPageContent: React.FC<{
   const systems = data?.items ?? [];
 
   return (
-    <div className="m-8 space-y-8">
-      <div className="flex w-full items-center justify-between">
-        <h2 className="text-2xl font-bold">Systems</h2>
+    <div className="flex flex-col">
+      <PageHeader className="z-20 flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <SidebarTrigger name={Sidebars.Deployments}>
+            <IconMenu2 className="h-4 w-4" />
+          </SidebarTrigger>
+          <Separator orientation="vertical" className="mr-2 h-4" />
+          <Breadcrumb>
+            <BreadcrumbList>
+              <BreadcrumbItem className="hidden md:block">
+                <BreadcrumbPage>Systems</BreadcrumbPage>
+              </BreadcrumbItem>
+            </BreadcrumbList>
+          </Breadcrumb>
+        </div>
+
         <div className="flex items-center gap-2">
           <CreateSystemDialog workspace={workspace}>
             <Button variant="outline" size="sm">
@@ -70,24 +94,30 @@ export const SystemsPageContent: React.FC<{
             </Button>
           </CreateDeploymentDialog>
         </div>
-      </div>
+      </PageHeader>
 
-      <Input
-        value={search}
-        onChange={(e) => setSearch(e.target.value)}
-        placeholder="Search systems and deployments..."
-        className="w-80"
-      />
-      {isLoading &&
-        Array.from({ length: 2 }).map((_, i) => (
-          <div key={i} className="rounded-md border">
-            <SystemDeploymentSkeleton />
-          </div>
-        ))}
-      {!isLoading &&
-        systems.map((s) => (
-          <SystemDeploymentTable key={s.id} workspace={workspace} system={s} />
-        ))}
+      <div className="space-y-8 p-8">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          placeholder="Search systems and deployments..."
+          className="w-80"
+        />
+        {isLoading &&
+          Array.from({ length: 2 }).map((_, i) => (
+            <div key={i} className="rounded-md border">
+              <SystemDeploymentSkeleton />
+            </div>
+          ))}
+        {!isLoading &&
+          systems.map((s) => (
+            <SystemDeploymentTable
+              key={s.id}
+              workspace={workspace}
+              system={s}
+            />
+          ))}
+      </div>
     </div>
   );
 };
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/TableDeployments.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx
similarity index 97%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/TableDeployments.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx
index 45b1d2e10..446bcacb5 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/_components/system-deployment-table/TableDeployments.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx
@@ -15,7 +15,7 @@ import {
   TableRow,
 } from "@ctrlplane/ui/table";
 
-import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/DeploymentEnvironmentCell";
+import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell";
 import { urls } from "~/app/urls";
 import { api } from "~/trpc/react";
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/page.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/page.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/page.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/charts/DeploymentBarChart.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx
similarity index 89%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/charts/DeploymentBarChart.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx
index 8b3cdbeda..ead06d6c2 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/charts/DeploymentBarChart.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx
@@ -10,7 +10,7 @@ import {
   YAxis,
 } from "recharts";
 
-import { getStatusColor } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_utils/status-color";
+import { getStatusColor } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color";
 
 export const DeploymentBarChart: React.FC<{
   data: { name: string; count: number }[];
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/DeleteDeployment.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/DeleteDeployment.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/EditDeploymentDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/dropdown/EditDeploymentDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx
similarity index 96%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx
index fa305194b..c38bc7219 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx
@@ -13,9 +13,9 @@ import { useInView } from "react-intersection-observer";
 import { Button } from "@ctrlplane/ui/button";
 import { Skeleton } from "@ctrlplane/ui/skeleton";
 
+import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog";
+import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu";
 import { api } from "~/trpc/react";
-import { ApprovalDialog } from "../../release/ApprovalDialog";
-import { ReleaseDropdownMenu } from "../../release/ReleaseDropdownMenu";
 import { Release } from "./ReleaseInfo";
 
 type DeploymentEnvironmentCellProps = {
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/ReleaseInfo.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx
similarity index 96%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/ReleaseInfo.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx
index 44de41d79..525b63580 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/ReleaseInfo.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx
@@ -25,12 +25,12 @@ import {
 } from "@ctrlplane/validators/conditions";
 import { activeStatusType, JobFilterType } from "@ctrlplane/validators/jobs";
 
-import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/charts/DeploymentBarChart";
-import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ReleaseDropdownMenu";
+import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart";
+import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu";
 import {
   getStatusColor,
   statusColor,
-} from "~/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_utils/status-color";
+} from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color";
 import { api } from "~/trpc/react";
 import { StatusIcon } from "./StatusIcon";
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/StatusIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/deployments/environment-cell/StatusIcon.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ApprovalDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ApprovalDialog.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/CreateRelease.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/CreateRelease.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ReleaseDropdownMenu.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu.tsx
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_components/release/ReleaseDropdownMenu.tsx
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu.tsx
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_utils/status-color.ts b/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color.ts
similarity index 100%
rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/_utils/status-color.ts
rename to apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color.ts
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/DeploymentsSidebarIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/DeploymentsSidebarIcon.tsx
new file mode 100644
index 000000000..7c06bda92
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/DeploymentsSidebarIcon.tsx
@@ -0,0 +1,45 @@
+"use client";
+
+import Link from "next/link";
+import { useParams, usePathname } from "next/navigation";
+import { IconRocket } from "@tabler/icons-react";
+
+import { cn } from "@ctrlplane/ui";
+
+import { urls } from "~/app/urls";
+
+export const DeploymentsSidebarIcon: React.FC = () => {
+  const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
+  const workspaceUrls = urls.workspace(workspaceSlug);
+  const deploymentsUrl = workspaceUrls.deployments();
+  const systemsUrl = workspaceUrls.systems();
+
+  const pathname = usePathname();
+  const active =
+    pathname.startsWith(deploymentsUrl) || pathname.startsWith(systemsUrl);
+
+  return (
+    <div className="size-20 text-muted-foreground">
+      <Link
+        href={systemsUrl}
+        className={cn(
+          "border-r-1 group flex h-full flex-col items-center justify-center gap-1 p-2",
+        )}
+      >
+        <span
+          className={cn(
+            "rounded-lg p-2",
+            active
+              ? "bg-purple-500/20 text-purple-400"
+              : "transition-colors duration-200 group-hover:bg-neutral-400/10",
+          )}
+        >
+          <IconRocket />
+        </span>
+        <span className={cn("text-xs", active && "text-purple-400")}>
+          Deploys
+        </span>
+      </Link>
+    </div>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx
index 4c4b4bc49..01bd1c013 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx
@@ -9,7 +9,6 @@ import { useSearchParams } from "next/navigation";
 import { IconSearch } from "@tabler/icons-react";
 import { endOfDay, startOfMonth, subDays, subMonths, subWeeks } from "date-fns";
 
-import { Card } from "@ctrlplane/ui/card";
 import { Input } from "@ctrlplane/ui/input";
 import { Tabs, TabsList, TabsTrigger } from "@ctrlplane/ui/tabs";
 
@@ -64,7 +63,7 @@ export const DeploymentsCard: React.FC<{
 
   return (
     <div className="space-y-2">
-      <div className="flex items-center justify-between">
+      <div className="flex items-center justify-between border-b p-2">
         <div className="relative">
           <IconSearch className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
           <Input
@@ -85,13 +84,9 @@ export const DeploymentsCard: React.FC<{
         </Tabs>
       </div>
 
-      <Card className="rounded-md bg-inherit">
-        <div>
-          <div className="relative w-full overflow-auto">
-            <DeploymentTable data={data} isLoading={isLoading} />
-          </div>
-        </div>
-      </Card>
+      <div className="relative w-full overflow-auto">
+        <DeploymentTable data={data} isLoading={isLoading} />
+      </div>
     </div>
   );
 };
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx
index 9362f7e03..39c985f84 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx
@@ -1,11 +1,5 @@
 import React from "react";
-import {
-  IconCategory,
-  IconChartBar,
-  IconCube,
-  IconRocket,
-  IconSettings,
-} from "@tabler/icons-react";
+import { IconChartBar, IconCube, IconSettings } from "@tabler/icons-react";
 
 import { EnvironmentDrawer } from "../(app)/_components/environment-drawer/EnvironmentDrawer";
 import { EnvironmentPolicyDrawer } from "../(app)/_components/environment-policy-drawer/EnvironmentPolicyDrawer";
@@ -13,6 +7,7 @@ import { ReleaseChannelDrawer } from "./_components/channel/drawer/ReleaseChanne
 import { DeploymentResourceDrawer } from "./_components/deployments/resource-drawer/DeploymentResourceDrawer";
 import { JobDrawer } from "./_components/job/drawer/JobDrawer";
 import { VariableSetDrawer } from "./_components/variable-set/VariableSetDrawer";
+import { DeploymentsSidebarIcon } from "./DeploymentsSidebarIcon";
 import { TopNav } from "./TopNav";
 import { TopSidebarIcon } from "./TopSidebarIcon";
 
@@ -30,16 +25,8 @@ export default async function Layout(props: {
 
         <div className="flex h-full flex-1">
           <aside className="flex flex-col bg-[#111111] pt-2">
-            <TopSidebarIcon
-              icon={<IconCategory />}
-              label="Systems"
-              href={`/${params.workspaceSlug}/systems`}
-            />
-            <TopSidebarIcon
-              icon={<IconRocket />}
-              label="Deploys"
-              href={`/${params.workspaceSlug}/deployments`}
-            />
+            <DeploymentsSidebarIcon />
+
             <TopSidebarIcon
               icon={<IconCube />}
               label="Resources"
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/page.tsx
deleted file mode 100644
index d164ac2f8..000000000
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/systems/[systemSlug]/(sidebar)/variables/page.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { notFound } from "next/navigation";
-import { IconMenu2 } from "@tabler/icons-react";
-
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
-import { Button } from "@ctrlplane/ui/button";
-import { Separator } from "@ctrlplane/ui/separator";
-import { SidebarTrigger } from "@ctrlplane/ui/sidebar";
-
-import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader";
-import { Sidebars } from "~/app/[workspaceSlug]/sidebars";
-import { api } from "~/trpc/server";
-import { CreateVariableSetDialog } from "./CreateVariableSetDialog";
-import { VariableSetGettingStarted } from "./GettingStartedVariableSets";
-import { VariableSetsTable } from "./VariableSetsTable";
-
-export default async function SystemVariableSetsPage(props: {
-  params: Promise<{ workspaceSlug: string; systemSlug: string }>;
-}) {
-  const params = await props.params;
-  const workspace = await api.workspace
-    .bySlug(params.workspaceSlug)
-    .catch(() => notFound());
-  if (!workspace) notFound();
-  const system = await api.system.bySlug(params).catch(() => notFound());
-
-  const variableSets = await api.variableSet.bySystemId(system.id);
-  return (
-    <div>
-      <PageHeader>
-        <SidebarTrigger name={Sidebars.System}>
-          <IconMenu2 className="h-4 w-4" />
-        </SidebarTrigger>
-        <Separator orientation="vertical" className="mr-2 h-4" />
-        <Breadcrumb>
-          <BreadcrumbList>
-            <BreadcrumbItem className="hidden md:block">
-              <BreadcrumbPage>Variables</BreadcrumbPage>
-            </BreadcrumbItem>
-          </BreadcrumbList>
-        </Breadcrumb>
-
-        <div className="flex-grow" />
-        <CreateVariableSetDialog
-          systemId={system.id}
-          environments={system.environments}
-        >
-          <Button size="sm" variant="outline">
-            Create Variable Set
-          </Button>
-        </CreateVariableSetDialog>
-      </PageHeader>
-
-      {variableSets.length === 0 && (
-        <VariableSetGettingStarted
-          systemId={system.id}
-          environments={system.environments}
-        />
-      )}
-      {variableSets.length !== 0 && (
-        <VariableSetsTable variableSets={variableSets} />
-      )}
-    </div>
-  );
-}
diff --git a/apps/webservice/src/app/[workspaceSlug]/sidebars.ts b/apps/webservice/src/app/[workspaceSlug]/sidebars.ts
index 5ac5090e5..946735554 100644
--- a/apps/webservice/src/app/[workspaceSlug]/sidebars.ts
+++ b/apps/webservice/src/app/[workspaceSlug]/sidebars.ts
@@ -3,6 +3,7 @@ export enum Sidebars {
   System = "system",
   Resources = "resources",
   Resource = "resource",
+  Deployments = "deployments",
   Deployment = "deployment",
   Environment = "environment",
   EnvironmentAnalytics = "environment-analytics",