diff --git a/apps/dokploy/server/api/routers/certificate.ts b/apps/dokploy/server/api/routers/certificate.ts
index 87e6c6c8..cdca1e97 100644
--- a/apps/dokploy/server/api/routers/certificate.ts
+++ b/apps/dokploy/server/api/routers/certificate.ts
@@ -25,7 +25,7 @@ export const certificateRouter = createTRPCRouter({
 					message: "Please set a server to create a certificate",
 				});
 			}
-			return await createCertificate(input, ctx.user.ownerId);
+			return await createCertificate(input, ctx.session.activeOrganizationId);
 		}),
 
 	one: adminProcedure
diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts
index b5717179..1ac37716 100644
--- a/apps/dokploy/server/api/routers/registry.ts
+++ b/apps/dokploy/server/api/routers/registry.ts
@@ -4,25 +4,26 @@ import {
 	apiRemoveRegistry,
 	apiTestRegistry,
 	apiUpdateRegistry,
+	registry,
 } from "@/server/db/schema";
 import {
 	IS_CLOUD,
 	createRegistry,
 	execAsync,
 	execAsyncRemote,
-	findAllRegistryByUserId,
 	findRegistryById,
 	removeRegistry,
 	updateRegistry,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
+import { eq } from "drizzle-orm";
 
 export const registryRouter = createTRPCRouter({
 	create: adminProcedure
 		.input(apiCreateRegistry)
 		.mutation(async ({ ctx, input }) => {
-			return await createRegistry(input, ctx.user.ownerId);
+			return await createRegistry(input, ctx.session.activeOrganizationId);
 		}),
 	remove: adminProcedure
 		.input(apiRemoveRegistry)
@@ -61,7 +62,10 @@ export const registryRouter = createTRPCRouter({
 			return true;
 		}),
 	all: protectedProcedure.query(async ({ ctx }) => {
-		return await findAllRegistryByUserId(ctx.user.ownerId);
+		const registryResponse = await db.query.registry.findMany({
+			where: eq(registry.organizationId, ctx.session.activeOrganizationId),
+		});
+		return registryResponse;
 	}),
 	one: adminProcedure
 		.input(apiFindOneRegistry)
diff --git a/packages/server/src/services/certificate.ts b/packages/server/src/services/certificate.ts
index dd83e61d..f59f1c2a 100644
--- a/packages/server/src/services/certificate.ts
+++ b/packages/server/src/services/certificate.ts
@@ -33,13 +33,13 @@ export const findCertificateById = async (certificateId: string) => {
 
 export const createCertificate = async (
 	certificateData: z.infer<typeof apiCreateCertificate>,
-	userId: string,
+	organizationId: string,
 ) => {
 	const certificate = await db
 		.insert(certificates)
 		.values({
 			...certificateData,
-			userId: userId,
+			organizationId: organizationId,
 		})
 		.returning();
 
diff --git a/packages/server/src/services/registry.ts b/packages/server/src/services/registry.ts
index b92eabdb..853f4cf7 100644
--- a/packages/server/src/services/registry.ts
+++ b/packages/server/src/services/registry.ts
@@ -12,14 +12,14 @@ export type Registry = typeof registry.$inferSelect;
 
 export const createRegistry = async (
 	input: typeof apiCreateRegistry._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newRegistry = await tx
 			.insert(registry)
 			.values({
 				...input,
-				userId: userId,
+				organizationId: organizationId,
 			})
 			.returning()
 			.then((value) => value[0]);
@@ -135,9 +135,11 @@ export const findRegistryById = async (registryId: string) => {
 	return registryResponse;
 };
 
-export const findAllRegistryByUserId = async (userId: string) => {
+export const findAllRegistryByOrganizationId = async (
+	organizationId: string,
+) => {
 	const registryResponse = await db.query.registry.findMany({
-		where: eq(registry.userId, userId),
+		where: eq(registry.organizationId, organizationId),
 	});
 	return registryResponse;
 };