diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
index 2babdff01c..4e823ea1a2 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
@@ -17,10 +17,10 @@ export default async function Layout({
 			<SecondaryMenu
 				items={[
 					{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
-					// {
-					// 	path: `/${orgId}/vendors/register`,
-					// 	label: t("vendors.register.title"),
-					// },
+					{
+						path: `/${orgId}/vendors/register`,
+						label: t("vendors.register.title"),
+					},
 				]}
 			/>
 
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/comments/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/comments/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/comments/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/comments/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx
similarity index 71%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/layout.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx
index f69ab0e564..7c74189739 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/layout.tsx
@@ -14,28 +14,28 @@ interface LayoutProps {
 export default async function Layout({ children, params }: LayoutProps) {
   const t = await getI18n();
   const session = await auth();
+  const user = session?.user;
+  const orgId = user?.organizationId;
 
-  if (!session || !session.user.organizationId) {
+  if (!session || !orgId) {
     redirect("/");
   }
 
   const riskId = await params;
-  const risk = await getRisk(riskId.riskId, session.user.organizationId);
+  const risk = await getRisk(riskId.riskId, orgId);
 
   if (!risk) {
     redirect("/risk");
   }
 
   return (
-    <div className="max-w-[1200px] space-y-4 m-auto">
+    <div className="max-w-[1200px] m-auto">
       <SecondaryMenu
-        showBackButton
-        backButtonHref="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/risk/register"
         items={[
-          { path: `/risk/${riskId.riskId}`, label: t("risk.overview") },
+          { path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
           {
-            path: `/risk/${riskId.riskId}/comments`,
-            label: t("common.comments.title"),
+            path: `/${orgId}/vendors/register`,
+            label: t("vendors.register.title"),
           },
         ]}
       />
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/actions/getTaskAttachments.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/hooks/useTaskAttachments.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/[taskId]/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/[taskId]/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/[riskId]/tasks/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[riskId]/tasks/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-comment-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-comment-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-comment-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-comment-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-risk-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-risk-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/create-vendor-sheet.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/inherent-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/inherent-risk-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/inherent-risk-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/inherent-risk-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/residual-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/residual-risk-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/residual-risk-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/residual-risk-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/risk-overview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/risk-overview.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/risk-overview.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/risk-overview.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-comment-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-comment-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-comment-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-comment-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/create-task-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/create-task-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-overview-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/task/update-task-overview-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/task/update-task-overview-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/update-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/components/update-risk-form.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/update-risk-form.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/VendorRegisterTable.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/VendorRegisterTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/VendorRegisterTable.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterColumns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterColumns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterColumns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterFilters.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/components/table/RiskRegisterFilters.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/table/RiskRegisterFilters.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx
new file mode 100644
index 0000000000..4e823ea1a2
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/layout.tsx
@@ -0,0 +1,30 @@
+import { auth } from "@/auth";
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+
+export default async function Layout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	const t = await getI18n();
+	const session = await auth();
+	const user = session?.user;
+	const orgId = user?.organizationId;
+
+	return (
+		<div className="max-w-[1200px] m-auto">
+			<SecondaryMenu
+				items={[
+					{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
+					{
+						path: `/${orgId}/vendors/register`,
+						label: t("vendors.register.title"),
+					},
+				]}
+			/>
+
+			<main className="mt-8">{children}</main>
+		</div>
+	);
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/page.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/search-params.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/search-params.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/search-params.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/layout.tsx
deleted file mode 100644
index 71699d2dc1..0000000000
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/vendors/register/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getI18n } from "@/locales/server";
-import { SecondaryMenu } from "@bubba/ui/secondary-menu";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const t = await getI18n();
-
-  return (
-    <div className="max-w-[1200px] m-auto">
-      <SecondaryMenu
-        items={[
-          { path: "/vendors", label: t("vendors.dashboard.title") },
-          { path: "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/vendors/register", label: t("vendors.register.title") },
-        ]}
-      />
-
-      <main className="mt-8">{children}</main>
-    </div>
-  );
-}
diff --git a/packages/integrations/src/azure/config.ts b/packages/integrations/src/azure/config.ts
index bc74281c57..9f23feb9f6 100644
--- a/packages/integrations/src/azure/config.ts
+++ b/packages/integrations/src/azure/config.ts
@@ -24,7 +24,7 @@ const config: {
 	category: string;
 	fetch: any;
 } = {
-  name: "AZURE",
+  name: "Azure",
   id: "azure",
   active: true,
   logo: imageBase64(),