diff --git a/SPMS.API/Controllers/AppConfigController.cs b/SPMS.API/Controllers/AppConfigController.cs
index 57c9afe..9ef542a 100644
--- a/SPMS.API/Controllers/AppConfigController.cs
+++ b/SPMS.API/Controllers/AppConfigController.cs
@@ -22,11 +22,7 @@ public class AppConfigController : ControllerBase
     [SwaggerOperation(Summary = "앱 기본 설정", Description = "앱 기본 설정 정보를 조회합니다.")]
     public async Task<IActionResult> GetAppSettingsAsync()
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _appConfigService.GetAppSettingsAsync(serviceCode);
+        var result = await _appConfigService.GetAppSettingsAsync();
         return Ok(ApiResponse<AppSettingsResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.API/Controllers/AppVersionController.cs b/SPMS.API/Controllers/AppVersionController.cs
index 3165fb5..d018439 100644
--- a/SPMS.API/Controllers/AppVersionController.cs
+++ b/SPMS.API/Controllers/AppVersionController.cs
@@ -22,11 +22,7 @@ public class AppVersionController : ControllerBase
     [SwaggerOperation(Summary = "앱 버전 체크", Description = "현재 앱 버전 정보를 확인하고 업데이트 필요 여부를 반환합니다.")]
     public async Task<IActionResult> CheckVersionAsync([FromBody] AppVersionRequestDto request)
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _appConfigService.GetAppVersionAsync(serviceCode, request);
+        var result = await _appConfigService.GetAppVersionAsync(request);
         return Ok(ApiResponse<AppVersionResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.API/Controllers/BannerController.cs b/SPMS.API/Controllers/BannerController.cs
index b68c9ce..474c80b 100644
--- a/SPMS.API/Controllers/BannerController.cs
+++ b/SPMS.API/Controllers/BannerController.cs
@@ -22,11 +22,7 @@ public class BannerController : ControllerBase
     [SwaggerOperation(Summary = "배너 목록", Description = "활성화된 배너 목록을 조회합니다. position으로 필터링 가능.")]
     public async Task<IActionResult> GetListAsync([FromBody] BannerListRequestDto request)
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _bannerService.GetListAsync(serviceCode, request);
+        var result = await _bannerService.GetListAsync(request);
         return Ok(ApiResponse<BannerListResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.API/Controllers/FaqController.cs b/SPMS.API/Controllers/FaqController.cs
index e582b53..bb42ef6 100644
--- a/SPMS.API/Controllers/FaqController.cs
+++ b/SPMS.API/Controllers/FaqController.cs
@@ -22,11 +22,7 @@ public class FaqController : ControllerBase
     [SwaggerOperation(Summary = "FAQ 목록", Description = "활성화된 FAQ 목록을 조회합니다. category로 필터링 가능.")]
     public async Task<IActionResult> GetListAsync([FromBody] FaqListRequestDto request)
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _faqService.GetListAsync(serviceCode, request);
+        var result = await _faqService.GetListAsync(request);
         return Ok(ApiResponse<FaqListResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.API/Controllers/NoticeController.cs b/SPMS.API/Controllers/NoticeController.cs
index 011f1bf..cf084af 100644
--- a/SPMS.API/Controllers/NoticeController.cs
+++ b/SPMS.API/Controllers/NoticeController.cs
@@ -22,11 +22,7 @@ public class NoticeController : ControllerBase
     [SwaggerOperation(Summary = "공지사항 목록", Description = "활성화된 공지사항 목록을 페이징으로 조회합니다. 상단 고정 우선 정렬.")]
     public async Task<IActionResult> GetListAsync([FromBody] NoticeListRequestDto request)
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _noticeService.GetListAsync(serviceCode, request);
+        var result = await _noticeService.GetListAsync(request);
         return Ok(ApiResponse<NoticeListResponseDto>.Success(result));
     }
 
@@ -34,11 +30,7 @@ public class NoticeController : ControllerBase
     [SwaggerOperation(Summary = "공지사항 상세", Description = "공지사항 ID로 상세 정보를 조회합니다.")]
     public async Task<IActionResult> GetInfoAsync([FromBody] NoticeInfoRequestDto request)
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _noticeService.GetInfoAsync(serviceCode, request);
+        var result = await _noticeService.GetInfoAsync(request);
         return Ok(ApiResponse<NoticeInfoResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.API/Controllers/TermsController.cs b/SPMS.API/Controllers/TermsController.cs
index af936f5..0155869 100644
--- a/SPMS.API/Controllers/TermsController.cs
+++ b/SPMS.API/Controllers/TermsController.cs
@@ -22,11 +22,7 @@ public class TermsController : ControllerBase
     [SwaggerOperation(Summary = "이용약관", Description = "이용약관 URL을 조회합니다.")]
     public async Task<IActionResult> GetTermsAsync()
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _appConfigService.GetTermsAsync(serviceCode);
+        var result = await _appConfigService.GetTermsAsync();
         return Ok(ApiResponse<AppConfigResponseDto>.Success(result));
     }
 
@@ -34,11 +30,7 @@ public class TermsController : ControllerBase
     [SwaggerOperation(Summary = "개인정보처리방침", Description = "개인정보처리방침 URL을 조회합니다.")]
     public async Task<IActionResult> GetPrivacyAsync()
     {
-        var serviceCode = Request.Headers["X-Service-Code"].FirstOrDefault();
-        if (string.IsNullOrWhiteSpace(serviceCode))
-            return BadRequest(ApiResponse.Fail(ErrorCodes.BadRequest, "X-Service-Code 헤더가 필요합니다."));
-
-        var result = await _appConfigService.GetPrivacyAsync(serviceCode);
+        var result = await _appConfigService.GetPrivacyAsync();
         return Ok(ApiResponse<AppConfigResponseDto>.Success(result));
     }
 }
diff --git a/SPMS.Application/Interfaces/IAppConfigService.cs b/SPMS.Application/Interfaces/IAppConfigService.cs
index f8fccbd..4234dae 100644
--- a/SPMS.Application/Interfaces/IAppConfigService.cs
+++ b/SPMS.Application/Interfaces/IAppConfigService.cs
@@ -4,8 +4,8 @@ namespace SPMS.Application.Interfaces;
 
 public interface IAppConfigService
 {
-    Task<AppConfigResponseDto> GetTermsAsync(string serviceCode);
-    Task<AppConfigResponseDto> GetPrivacyAsync(string serviceCode);
-    Task<AppVersionResponseDto> GetAppVersionAsync(string serviceCode, AppVersionRequestDto request);
-    Task<AppSettingsResponseDto> GetAppSettingsAsync(string serviceCode);
+    Task<AppConfigResponseDto> GetTermsAsync();
+    Task<AppConfigResponseDto> GetPrivacyAsync();
+    Task<AppVersionResponseDto> GetAppVersionAsync(AppVersionRequestDto request);
+    Task<AppSettingsResponseDto> GetAppSettingsAsync();
 }
diff --git a/SPMS.Application/Interfaces/IBannerService.cs b/SPMS.Application/Interfaces/IBannerService.cs
index cf79ae7..e792f8b 100644
--- a/SPMS.Application/Interfaces/IBannerService.cs
+++ b/SPMS.Application/Interfaces/IBannerService.cs
@@ -4,5 +4,5 @@ namespace SPMS.Application.Interfaces;
 
 public interface IBannerService
 {
-    Task<BannerListResponseDto> GetListAsync(string serviceCode, BannerListRequestDto request);
+    Task<BannerListResponseDto> GetListAsync(BannerListRequestDto request);
 }
diff --git a/SPMS.Application/Interfaces/IFaqService.cs b/SPMS.Application/Interfaces/IFaqService.cs
index fa263a8..c4b231f 100644
--- a/SPMS.Application/Interfaces/IFaqService.cs
+++ b/SPMS.Application/Interfaces/IFaqService.cs
@@ -4,5 +4,5 @@ namespace SPMS.Application.Interfaces;
 
 public interface IFaqService
 {
-    Task<FaqListResponseDto> GetListAsync(string serviceCode, FaqListRequestDto request);
+    Task<FaqListResponseDto> GetListAsync(FaqListRequestDto request);
 }
diff --git a/SPMS.Application/Interfaces/INoticeService.cs b/SPMS.Application/Interfaces/INoticeService.cs
index 123972d..92c481b 100644
--- a/SPMS.Application/Interfaces/INoticeService.cs
+++ b/SPMS.Application/Interfaces/INoticeService.cs
@@ -4,6 +4,6 @@ namespace SPMS.Application.Interfaces;
 
 public interface INoticeService
 {
-    Task<NoticeListResponseDto> GetListAsync(string serviceCode, NoticeListRequestDto request);
-    Task<NoticeInfoResponseDto> GetInfoAsync(string serviceCode, NoticeInfoRequestDto request);
+    Task<NoticeListResponseDto> GetListAsync(NoticeListRequestDto request);
+    Task<NoticeInfoResponseDto> GetInfoAsync(NoticeInfoRequestDto request);
 }
diff --git a/SPMS.Application/Services/AppConfigService.cs b/SPMS.Application/Services/AppConfigService.cs
index 0b0ca31..8e31d71 100644
--- a/SPMS.Application/Services/AppConfigService.cs
+++ b/SPMS.Application/Services/AppConfigService.cs
@@ -1,7 +1,5 @@
 using SPMS.Application.DTOs.AppConfig;
 using SPMS.Application.Interfaces;
-using SPMS.Domain.Common;
-using SPMS.Domain.Exceptions;
 using SPMS.Domain.Interfaces;
 
 namespace SPMS.Application.Services;
@@ -9,36 +7,32 @@ namespace SPMS.Application.Services;
 public class AppConfigService : IAppConfigService
 {
     private readonly IAppConfigRepository _appConfigRepository;
-    private readonly IServiceRepository _serviceRepository;
 
-    public AppConfigService(IAppConfigRepository appConfigRepository, IServiceRepository serviceRepository)
+    public AppConfigService(IAppConfigRepository appConfigRepository)
     {
         _appConfigRepository = appConfigRepository;
-        _serviceRepository = serviceRepository;
     }
 
-    public async Task<AppConfigResponseDto> GetTermsAsync(string serviceCode)
+    public async Task<AppConfigResponseDto> GetTermsAsync()
     {
-        return await GetConfigUrlAsync(serviceCode, "terms_url");
+        var config = await _appConfigRepository.GetByKeyAsync("terms_url");
+        return new AppConfigResponseDto { Url = config?.ConfigValue };
     }
 
-    public async Task<AppConfigResponseDto> GetPrivacyAsync(string serviceCode)
+    public async Task<AppConfigResponseDto> GetPrivacyAsync()
     {
-        return await GetConfigUrlAsync(serviceCode, "privacy_url");
+        var config = await _appConfigRepository.GetByKeyAsync("privacy_url");
+        return new AppConfigResponseDto { Url = config?.ConfigValue };
     }
 
-    public async Task<AppVersionResponseDto> GetAppVersionAsync(string serviceCode, AppVersionRequestDto request)
+    public async Task<AppVersionResponseDto> GetAppVersionAsync(AppVersionRequestDto request)
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var latestVersion = await _appConfigRepository.GetByKeyAsync(service.Id, "latest_version");
-        var minVersion = await _appConfigRepository.GetByKeyAsync(service.Id, "min_version");
-        var forceUpdate = await _appConfigRepository.GetByKeyAsync(service.Id, "force_update");
+        var latestVersion = await _appConfigRepository.GetByKeyAsync("latest_version");
+        var minVersion = await _appConfigRepository.GetByKeyAsync("min_version");
+        var forceUpdate = await _appConfigRepository.GetByKeyAsync("force_update");
 
         var updateUrlKey = request.Platform?.ToLowerInvariant() == "ios" ? "update_url_ios" : "update_url_android";
-        var updateUrl = await _appConfigRepository.GetByKeyAsync(service.Id, updateUrlKey);
+        var updateUrl = await _appConfigRepository.GetByKeyAsync(updateUrlKey);
 
         return new AppVersionResponseDto
         {
@@ -49,13 +43,9 @@ public class AppConfigService : IAppConfigService
         };
     }
 
-    public async Task<AppSettingsResponseDto> GetAppSettingsAsync(string serviceCode)
+    public async Task<AppSettingsResponseDto> GetAppSettingsAsync()
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var configs = await _appConfigRepository.GetAllByServiceAsync(service.Id);
+        var configs = await _appConfigRepository.GetAllAsync();
         var configDict = configs.ToDictionary(c => c.ConfigKey, c => c.ConfigValue);
 
         return new AppSettingsResponseDto
@@ -67,18 +57,4 @@ public class AppConfigService : IAppConfigService
             CsPhone = configDict.GetValueOrDefault("cs_phone")
         };
     }
-
-    private async Task<AppConfigResponseDto> GetConfigUrlAsync(string serviceCode, string configKey)
-    {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var config = await _appConfigRepository.GetByKeyAsync(service.Id, configKey);
-
-        return new AppConfigResponseDto
-        {
-            Url = config?.ConfigValue
-        };
-    }
 }
diff --git a/SPMS.Application/Services/BannerService.cs b/SPMS.Application/Services/BannerService.cs
index bc7bd1f..051a20a 100644
--- a/SPMS.Application/Services/BannerService.cs
+++ b/SPMS.Application/Services/BannerService.cs
@@ -1,7 +1,5 @@
 using SPMS.Application.DTOs.Banner;
 using SPMS.Application.Interfaces;
-using SPMS.Domain.Common;
-using SPMS.Domain.Exceptions;
 using SPMS.Domain.Interfaces;
 
 namespace SPMS.Application.Services;
@@ -9,21 +7,15 @@ namespace SPMS.Application.Services;
 public class BannerService : IBannerService
 {
     private readonly IBannerRepository _bannerRepository;
-    private readonly IServiceRepository _serviceRepository;
 
-    public BannerService(IBannerRepository bannerRepository, IServiceRepository serviceRepository)
+    public BannerService(IBannerRepository bannerRepository)
     {
         _bannerRepository = bannerRepository;
-        _serviceRepository = serviceRepository;
     }
 
-    public async Task<BannerListResponseDto> GetListAsync(string serviceCode, BannerListRequestDto request)
+    public async Task<BannerListResponseDto> GetListAsync(BannerListRequestDto request)
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var items = await _bannerRepository.GetActiveListAsync(service.Id, request.Position);
+        var items = await _bannerRepository.GetActiveListAsync(request.Position);
 
         return new BannerListResponseDto
         {
diff --git a/SPMS.Application/Services/FaqService.cs b/SPMS.Application/Services/FaqService.cs
index e7435f3..bafff52 100644
--- a/SPMS.Application/Services/FaqService.cs
+++ b/SPMS.Application/Services/FaqService.cs
@@ -1,7 +1,5 @@
 using SPMS.Application.DTOs.Faq;
 using SPMS.Application.Interfaces;
-using SPMS.Domain.Common;
-using SPMS.Domain.Exceptions;
 using SPMS.Domain.Interfaces;
 
 namespace SPMS.Application.Services;
@@ -9,21 +7,15 @@ namespace SPMS.Application.Services;
 public class FaqService : IFaqService
 {
     private readonly IFaqRepository _faqRepository;
-    private readonly IServiceRepository _serviceRepository;
 
-    public FaqService(IFaqRepository faqRepository, IServiceRepository serviceRepository)
+    public FaqService(IFaqRepository faqRepository)
     {
         _faqRepository = faqRepository;
-        _serviceRepository = serviceRepository;
     }
 
-    public async Task<FaqListResponseDto> GetListAsync(string serviceCode, FaqListRequestDto request)
+    public async Task<FaqListResponseDto> GetListAsync(FaqListRequestDto request)
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var items = await _faqRepository.GetActiveListAsync(service.Id, request.Category);
+        var items = await _faqRepository.GetActiveListAsync(request.Category);
 
         return new FaqListResponseDto
         {
diff --git a/SPMS.Application/Services/NoticeService.cs b/SPMS.Application/Services/NoticeService.cs
index 70f28cb..0ac3ce9 100644
--- a/SPMS.Application/Services/NoticeService.cs
+++ b/SPMS.Application/Services/NoticeService.cs
@@ -9,21 +9,15 @@ namespace SPMS.Application.Services;
 public class NoticeService : INoticeService
 {
     private readonly INoticeRepository _noticeRepository;
-    private readonly IServiceRepository _serviceRepository;
 
-    public NoticeService(INoticeRepository noticeRepository, IServiceRepository serviceRepository)
+    public NoticeService(INoticeRepository noticeRepository)
     {
         _noticeRepository = noticeRepository;
-        _serviceRepository = serviceRepository;
     }
 
-    public async Task<NoticeListResponseDto> GetListAsync(string serviceCode, NoticeListRequestDto request)
+    public async Task<NoticeListResponseDto> GetListAsync(NoticeListRequestDto request)
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var (items, totalCount) = await _noticeRepository.GetActivePagedAsync(service.Id, request.Page, request.Size);
+        var (items, totalCount) = await _noticeRepository.GetActivePagedAsync(request.Page, request.Size);
 
         var totalPages = (int)Math.Ceiling((double)totalCount / request.Size);
 
@@ -46,13 +40,9 @@ public class NoticeService : INoticeService
         };
     }
 
-    public async Task<NoticeInfoResponseDto> GetInfoAsync(string serviceCode, NoticeInfoRequestDto request)
+    public async Task<NoticeInfoResponseDto> GetInfoAsync(NoticeInfoRequestDto request)
     {
-        var service = await _serviceRepository.GetByServiceCodeAsync(serviceCode);
-        if (service == null)
-            throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 서비스입니다.", 404);
-
-        var notice = await _noticeRepository.GetActiveByIdAsync(request.NoticeId, service.Id);
+        var notice = await _noticeRepository.GetActiveByIdAsync(request.NoticeId);
         if (notice == null)
             throw new SpmsException(ErrorCodes.NotFound, "존재하지 않는 공지사항입니다.", 404);
 
diff --git a/SPMS.Domain/Interfaces/IAppConfigRepository.cs b/SPMS.Domain/Interfaces/IAppConfigRepository.cs
index 01cf381..549645a 100644
--- a/SPMS.Domain/Interfaces/IAppConfigRepository.cs
+++ b/SPMS.Domain/Interfaces/IAppConfigRepository.cs
@@ -4,6 +4,5 @@ namespace SPMS.Domain.Interfaces;
 
 public interface IAppConfigRepository : IRepository<AppConfig>
 {
-    Task<AppConfig?> GetByKeyAsync(long serviceId, string configKey);
-    Task<IReadOnlyList<AppConfig>> GetAllByServiceAsync(long serviceId);
+    Task<AppConfig?> GetByKeyAsync(string configKey);
 }
diff --git a/SPMS.Domain/Interfaces/IBannerRepository.cs b/SPMS.Domain/Interfaces/IBannerRepository.cs
index e476431..8cfeb8f 100644
--- a/SPMS.Domain/Interfaces/IBannerRepository.cs
+++ b/SPMS.Domain/Interfaces/IBannerRepository.cs
@@ -4,5 +4,5 @@ namespace SPMS.Domain.Interfaces;
 
 public interface IBannerRepository : IRepository<Banner>
 {
-    Task<IReadOnlyList<Banner>> GetActiveListAsync(long serviceId, string? position = null);
+    Task<IReadOnlyList<Banner>> GetActiveListAsync(string? position = null);
 }
diff --git a/SPMS.Domain/Interfaces/IFaqRepository.cs b/SPMS.Domain/Interfaces/IFaqRepository.cs
index 7e7459b..a7c160f 100644
--- a/SPMS.Domain/Interfaces/IFaqRepository.cs
+++ b/SPMS.Domain/Interfaces/IFaqRepository.cs
@@ -4,5 +4,5 @@ namespace SPMS.Domain.Interfaces;
 
 public interface IFaqRepository : IRepository<Faq>
 {
-    Task<IReadOnlyList<Faq>> GetActiveListAsync(long serviceId, string? category = null);
+    Task<IReadOnlyList<Faq>> GetActiveListAsync(string? category = null);
 }
diff --git a/SPMS.Domain/Interfaces/INoticeRepository.cs b/SPMS.Domain/Interfaces/INoticeRepository.cs
index 4a6ef5b..261a359 100644
--- a/SPMS.Domain/Interfaces/INoticeRepository.cs
+++ b/SPMS.Domain/Interfaces/INoticeRepository.cs
@@ -4,6 +4,6 @@ namespace SPMS.Domain.Interfaces;
 
 public interface INoticeRepository : IRepository<Notice>
 {
-    Task<(IReadOnlyList<Notice> Items, int TotalCount)> GetActivePagedAsync(long serviceId, int page, int size);
-    Task<Notice?> GetActiveByIdAsync(long id, long serviceId);
+    Task<(IReadOnlyList<Notice> Items, int TotalCount)> GetActivePagedAsync(int page, int size);
+    Task<Notice?> GetActiveByIdAsync(long id);
 }
diff --git a/SPMS.Infrastructure/Persistence/Repositories/AppConfigRepository.cs b/SPMS.Infrastructure/Persistence/Repositories/AppConfigRepository.cs
index 8079bde..383aeaf 100644
--- a/SPMS.Infrastructure/Persistence/Repositories/AppConfigRepository.cs
+++ b/SPMS.Infrastructure/Persistence/Repositories/AppConfigRepository.cs
@@ -8,13 +8,8 @@ public class AppConfigRepository : Repository<AppConfig>, IAppConfigRepository
 {
     public AppConfigRepository(AppDbContext context) : base(context) { }
 
-    public async Task<AppConfig?> GetByKeyAsync(long serviceId, string configKey)
+    public async Task<AppConfig?> GetByKeyAsync(string configKey)
     {
-        return await _dbSet.FirstOrDefaultAsync(c => c.ServiceId == serviceId && c.ConfigKey == configKey);
-    }
-
-    public async Task<IReadOnlyList<AppConfig>> GetAllByServiceAsync(long serviceId)
-    {
-        return await _dbSet.Where(c => c.ServiceId == serviceId).ToListAsync();
+        return await _dbSet.FirstOrDefaultAsync(c => c.ConfigKey == configKey);
     }
 }
diff --git a/SPMS.Infrastructure/Persistence/Repositories/BannerRepository.cs b/SPMS.Infrastructure/Persistence/Repositories/BannerRepository.cs
index c28c6fc..a0aef6a 100644
--- a/SPMS.Infrastructure/Persistence/Repositories/BannerRepository.cs
+++ b/SPMS.Infrastructure/Persistence/Repositories/BannerRepository.cs
@@ -8,9 +8,9 @@ public class BannerRepository : Repository<Banner>, IBannerRepository
 {
     public BannerRepository(AppDbContext context) : base(context) { }
 
-    public async Task<IReadOnlyList<Banner>> GetActiveListAsync(long serviceId, string? position = null)
+    public async Task<IReadOnlyList<Banner>> GetActiveListAsync(string? position = null)
     {
-        var query = _dbSet.Where(b => b.ServiceId == serviceId && b.IsActive);
+        var query = _dbSet.Where(b => b.IsActive);
 
         if (!string.IsNullOrWhiteSpace(position))
             query = query.Where(b => b.Position == position);
diff --git a/SPMS.Infrastructure/Persistence/Repositories/FaqRepository.cs b/SPMS.Infrastructure/Persistence/Repositories/FaqRepository.cs
index f39a776..adca46f 100644
--- a/SPMS.Infrastructure/Persistence/Repositories/FaqRepository.cs
+++ b/SPMS.Infrastructure/Persistence/Repositories/FaqRepository.cs
@@ -8,9 +8,9 @@ public class FaqRepository : Repository<Faq>, IFaqRepository
 {
     public FaqRepository(AppDbContext context) : base(context) { }
 
-    public async Task<IReadOnlyList<Faq>> GetActiveListAsync(long serviceId, string? category = null)
+    public async Task<IReadOnlyList<Faq>> GetActiveListAsync(string? category = null)
     {
-        var query = _dbSet.Where(f => f.ServiceId == serviceId && f.IsActive);
+        var query = _dbSet.Where(f => f.IsActive);
 
         if (!string.IsNullOrWhiteSpace(category))
             query = query.Where(f => f.Category == category);
diff --git a/SPMS.Infrastructure/Persistence/Repositories/NoticeRepository.cs b/SPMS.Infrastructure/Persistence/Repositories/NoticeRepository.cs
index 3d3c275..68af693 100644
--- a/SPMS.Infrastructure/Persistence/Repositories/NoticeRepository.cs
+++ b/SPMS.Infrastructure/Persistence/Repositories/NoticeRepository.cs
@@ -8,9 +8,9 @@ public class NoticeRepository : Repository<Notice>, INoticeRepository
 {
     public NoticeRepository(AppDbContext context) : base(context) { }
 
-    public async Task<(IReadOnlyList<Notice> Items, int TotalCount)> GetActivePagedAsync(long serviceId, int page, int size)
+    public async Task<(IReadOnlyList<Notice> Items, int TotalCount)> GetActivePagedAsync(int page, int size)
     {
-        var query = _dbSet.Where(n => n.ServiceId == serviceId && n.IsActive);
+        var query = _dbSet.Where(n => n.IsActive);
 
         var totalCount = await query.CountAsync();
 
@@ -24,8 +24,8 @@ public class NoticeRepository : Repository<Notice>, INoticeRepository
         return (items, totalCount);
     }
 
-    public async Task<Notice?> GetActiveByIdAsync(long id, long serviceId)
+    public async Task<Notice?> GetActiveByIdAsync(long id)
     {
-        return await _dbSet.FirstOrDefaultAsync(n => n.Id == id && n.ServiceId == serviceId && n.IsActive);
+        return await _dbSet.FirstOrDefaultAsync(n => n.Id == id && n.IsActive);
     }
 }