diff --git a/packages/lib/server/repository/credits.test.ts b/packages/features/credits/repositories/CreditsRepository.test.ts
similarity index 98%
rename from packages/lib/server/repository/credits.test.ts
rename to packages/features/credits/repositories/CreditsRepository.test.ts
index 609a04d27a..53c3fd296f 100644
--- a/packages/lib/server/repository/credits.test.ts
+++ b/packages/features/credits/repositories/CreditsRepository.test.ts
@@ -4,7 +4,7 @@ import { describe, it, expect, beforeEach, vi, afterEach } from "vitest";
 
 import { CreditType } from "@calcom/prisma/enums";
 
-import { CreditsRepository } from "./credits";
+import { CreditsRepository } from "./CreditsRepository";
 
 describe("CreditsRepository", () => {
   beforeEach(() => {
diff --git a/packages/lib/server/repository/credits.ts b/packages/features/credits/repositories/CreditsRepository.ts
similarity index 100%
rename from packages/lib/server/repository/credits.ts
rename to packages/features/credits/repositories/CreditsRepository.ts
diff --git a/packages/features/ee/billing/api/webhook/_checkout.session.completed.ts b/packages/features/ee/billing/api/webhook/_checkout.session.completed.ts
index 5b3ab28200..03e572f84b 100644
--- a/packages/features/ee/billing/api/webhook/_checkout.session.completed.ts
+++ b/packages/features/ee/billing/api/webhook/_checkout.session.completed.ts
@@ -1,10 +1,10 @@
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
 import { PrismaAgentRepository } from "@calcom/features/calAIPhone/repositories/PrismaAgentRepository";
 import { PrismaPhoneNumberRepository } from "@calcom/features/calAIPhone/repositories/PrismaPhoneNumberRepository";
+import { CreditsRepository } from "@calcom/features/credits/repositories/CreditsRepository";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import logger from "@calcom/lib/logger";
-import { CreditsRepository } from "@calcom/lib/server/repository/credits";
-import prisma from "@calcom/prisma";
+import { prisma } from "@calcom/prisma";
 import { PhoneNumberSubscriptionStatus } from "@calcom/prisma/enums";
 
 import { CHECKOUT_SESSION_TYPES } from "../../constants";
diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index 7cecc6d236..d2f8667c9c 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -2,10 +2,10 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 
 import dayjs from "@calcom/dayjs";
 import * as EmailManager from "@calcom/emails/billing-email-service";
+import { CreditsRepository } from "@calcom/features/credits/repositories/CreditsRepository";
 import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
-import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import { CreditType } from "@calcom/prisma/enums";
 
 import { CreditService } from "./credit-service";
@@ -91,6 +91,7 @@ vi.mock("@calcom/prisma/enums", async (importOriginal) => {
 vi.mock("@calcom/lib/server/repository/credits");
 vi.mock("@calcom/features/membership/repositories/MembershipRepository");
 vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
+vi.mock("@calcom/features/credits/repositories/CreditsRepository");
 vi.mock("@calcom/emails/billing-email-service", () => ({
   sendCreditBalanceLimitReachedEmails: vi.fn().mockResolvedValue(undefined),
   sendCreditBalanceLowWarningEmails: vi.fn().mockResolvedValue(undefined),
@@ -125,10 +126,6 @@ vi.spyOn(creditService, "_getAllCredits").mockResolvedValue({
   additionalCredits: 1,
 });
 
-CreditsRepository.findCreditBalance.mockResolvedValueOnce({
-  limitReachedAt: null,
-});
-
 describe("CreditService", () => {
   let creditService: CreditService;
 
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 40c8760412..a01d0e94bc 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -1,12 +1,12 @@
 import type { TFunction } from "i18next";
 
 import dayjs from "@calcom/dayjs";
+import { CreditsRepository } from "@calcom/features/credits/repositories/CreditsRepository";
 import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { IS_SMS_CREDITS_ENABLED } from "@calcom/lib/constants";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
-import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import { prisma, type PrismaTransaction } from "@calcom/prisma";
 import { CreditUsageType, CreditType } from "@calcom/prisma/enums";
 
diff --git a/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts b/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
index 640143a6f2..89e96f037b 100644
--- a/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
+++ b/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
@@ -1,6 +1,6 @@
+import { CreditsRepository } from "@calcom/features/credits/repositories/CreditsRepository";
 import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import { MembershipRole } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.handler.ts b/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.handler.ts
index 0ce6897ba3..f5a2826510 100644
--- a/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.handler.ts
@@ -1,6 +1,6 @@
+import { CreditsRepository } from "@calcom/features/credits/repositories/CreditsRepository";
 import { sendVerificationCode } from "@calcom/features/ee/workflows/lib/reminders/verifyPhoneNumber";
 import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
-import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";