diff --git a/apps/web/modules/settings/billing/components/BillingCredits.tsx b/apps/web/modules/settings/billing/components/BillingCredits.tsx
index 36ae8b24453d02..04fc8ae1704549 100644
--- a/apps/web/modules/settings/billing/components/BillingCredits.tsx
+++ b/apps/web/modules/settings/billing/components/BillingCredits.tsx
@@ -1,7 +1,8 @@
 "use client";
 
+import { useSession } from "next-auth/react";
 import Link from "next/link";
-import { useRouter } from "next/navigation";
+import { useRouter, usePathname } from "next/navigation";
 import { useState, useMemo } from "react";
 import { useForm } from "react-hook-form";
 
@@ -53,6 +54,8 @@ const getMonthOptions = (): MonthOption[] => {
 export default function BillingCredits() {
   const { t } = useLocale();
   const router = useRouter();
+  const pathname = usePathname();
+  const session = useSession();
   const monthOptions = useMemo(() => getMonthOptions(), []);
   const [selectedMonth, setSelectedMonth] = useState<MonthOption>(monthOptions[0]);
   const [isDownloading, setIsDownloading] = useState(false);
@@ -66,7 +69,9 @@ export default function BillingCredits() {
   } = useForm<{ quantity: number }>({ defaultValues: { quantity: 50 } });
 
   const params = useParamsWithFallback();
-  const teamId = params.id ? Number(params.id) : undefined;
+  const orgId = session.data?.user?.org?.id;
+
+  const teamId = params.id ? Number(params.id) : orgId;
 
   const { data: creditsData, isLoading } = trpc.viewer.credits.getAllCredits.useQuery({ teamId });
 
@@ -106,6 +111,11 @@ export default function BillingCredits() {
     return null;
   }
 
+  if (orgId && !pathname?.includes("/organizations/")) {
+    // Don't show credits on personal billing if user is an org member
+    return null;
+  }
+
   if (isLoading && teamId) return <BillingCreditsSkeleton />;
   if (!creditsData) return null;
 
@@ -206,7 +216,7 @@ export default function BillingCredits() {
             <hr className="border-subtle mb-3 mt-3" />
           </div>
           <div className="flex">
-            <div className="mr-auto ">
+            <div className="mr-auto">
               <Label className="mb-4">{t("download_expense_log")}</Label>
               <div className="mt-2 flex flex-col">
                 <Select
diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index 917b3fae8afbe3..65beb6506accd9 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -446,6 +446,34 @@ describe("CreditService", () => {
         const result = await creditService.getMonthlyCredits(1);
         expect(result).toBe(1500); // (3 members * 1000 price) / 2
       });
+
+      it("should calculate credits with 20% multiplier for organizations", async () => {
+        const mockTeamRepo = {
+          findTeamWithMembers: vi.fn().mockResolvedValue({
+            id: 1,
+            isOrganization: true,
+            members: [{ accepted: true }, { accepted: true }],
+          }),
+        };
+        vi.mocked(TeamRepository).mockImplementation(() => mockTeamRepo as any);
+
+        const mockTeamBillingService = {
+          getSubscriptionStatus: vi.fn().mockResolvedValue("active"),
+        };
+        vi.spyOn(InternalTeamBilling.prototype, "getSubscriptionStatus").mockImplementation(
+          mockTeamBillingService.getSubscriptionStatus
+        );
+
+        const mockStripeBillingService = {
+          getPrice: vi.fn().mockResolvedValue({ unit_amount: 3700 }),
+        };
+        vi.spyOn(StripeBillingService.prototype, "getPrice").mockImplementation(
+          mockStripeBillingService.getPrice
+        );
+
+        const result = await creditService.getMonthlyCredits(1);
+        expect(result).toBe(1480); // (2 members * 3700 price) * 0.2
+      });
     });
 
     describe("getAllCreditsForTeam", () => {
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 342fda278bb05c..dd29d987b156f0 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -166,7 +166,7 @@ export class CreditService {
           );
           return true;
         }
-        // limtReachedAt is set and still no available credits
+        // limitReachedAt is set and still no available credits
         return false;
       }
 
@@ -555,9 +555,16 @@ export class CreditService {
 
     const billingService = new StripeBillingService();
 
-    const teamMonthlyPrice = await billingService.getPrice(process.env.STRIPE_TEAM_MONTHLY_PRICE_ID || "");
-    const pricePerSeat = teamMonthlyPrice.unit_amount ?? 0;
-    totalMonthlyCredits = (activeMembers * pricePerSeat) / 2;
+    const priceId = team.isOrganization
+      ? process.env.STRIPE_ORG_MONTHLY_PRICE_ID
+      : process.env.STRIPE_TEAM_MONTHLY_PRICE_ID;
+
+    const monthlyPrice = await billingService.getPrice(priceId || "");
+    const pricePerSeat = monthlyPrice.unit_amount ?? 0;
+
+    // Teams get 50% of the price as credits, organizations get 20%
+    const creditMultiplier = team.isOrganization ? 0.2 : 0.5;
+    totalMonthlyCredits = activeMembers * pricePerSeat * creditMultiplier;
 
     return totalMonthlyCredits;
   }
diff --git a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
index 2cb4eb6b296832..31614557eb00c0 100644
--- a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
+++ b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
@@ -1,6 +1,7 @@
 import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";
@@ -43,9 +44,21 @@ export const buyCreditsHandler = async ({ ctx, input }: BuyCreditsOptions) => {
     }
   }
 
-  const redirect_uri = teamId
-    ? `${WEBAPP_URL}/settings/teams/${teamId}/billing`
-    : `${WEBAPP_URL}/settings/billing`;
+  let redirect_uri = `${WEBAPP_URL}/settings/billing`;
+
+  if (teamId) {
+    // Check if the team is an organization
+    const team = await prisma.team.findUnique({
+      where: { id: teamId },
+      select: { isOrganization: true },
+    });
+
+    if (team?.isOrganization) {
+      redirect_uri = `${WEBAPP_URL}/settings/organizations/billing`;
+    } else {
+      redirect_uri = `${WEBAPP_URL}/settings/teams/${teamId}/billing`;
+    }
+  }
 
   const billingService = new StripeBillingService();