diff --git a/.github/actions-pipeline-guide.md b/.github/actions-pipeline-guide.md
index 2e717b3..a5e7ad4 100644
--- a/.github/actions-pipeline-guide.md
+++ b/.github/actions-pipeline-guide.md
@@ -2,178 +2,160 @@
 
 ## 📋 개요
 
-GitHub Actions를 이용한 백엔드 서비스 CI/CD 파이프라인 구축 가이드입니다.
-Kustomize를 활용한 환경별 배포 자동화와 SonarQube 품질 분석을 포함합니다.
+통신요금 관리 서비스(phonebill)의 GitHub Actions 기반 CI/CD 파이프라인 구축 가이드입니다.
 
-### 시스템 정보
-- **시스템명**: phonebill
-- **서비스 목록**: api-gateway, user-service, bill-service, product-service, kos-mock
-- **JDK 버전**: 21
-- **ACR 이름**: acrdigitalgarage01
-- **리소스 그룹**: rg-digitalgarage-01
-- **AKS 클러스터**: aks-digitalgarage-01
+**실행정보**:
+- ACR_NAME: acrdigitalgarage01
+- RESOURCE_GROUP: rg-digitalgarage-01
+- AKS_CLUSTER: aks-digitalgarage-01
 
-## 🏗️ 구축된 파일 구조
+**시스템 정보**:
+- 시스템명: phonebill
+- JDK 버전: 21
+- 서비스: api-gateway, user-service, bill-service, product-service, kos-mock
 
+## 🏗️ 구축된 파이프라인 구조
+
+### 디렉토리 구조
 ```
 .github/
 ├── kustomize/
-│   ├── base/
+│   ├── base/                    # 기본 매니페스트
 │   │   ├── kustomization.yaml
 │   │   ├── namespace.yaml
-│   │   ├── common/
-│   │   │   ├── cm-common.yaml
-│   │   │   ├── secret-common.yaml
-│   │   │   ├── secret-imagepull.yaml
-│   │   │   └── ingress.yaml
-│   │   └── {service-name}/
-│   │       ├── deployment.yaml
-│   │       ├── service.yaml
-│   │       ├── cm-{service-name}.yaml (존재 시)
-│   │       └── secret-{service-name}.yaml (존재 시)
-│   └── overlays/
+│   │   ├── common/              # 공통 리소스
+│   │   └── {서비스명}/          # 각 서비스별 매니페스트
+│   └── overlays/                # 환경별 오버레이
 │       ├── dev/
-│       │   ├── kustomization.yaml
-│       │   ├── cm-common-patch.yaml
-│       │   ├── secret-common-patch.yaml
-│       │   ├── ingress-patch.yaml
-│       │   ├── deployment-{service-name}-patch.yaml
-│       │   └── secret-{service-name}-patch.yaml
 │       ├── staging/
 │       └── prod/
-├── config/
+├── config/                      # 환경별 설정
 │   ├── deploy_env_vars_dev
 │   ├── deploy_env_vars_staging
 │   └── deploy_env_vars_prod
-├── scripts/
+├── scripts/                     # 배포 스크립트
 │   └── deploy-actions.sh
-└── workflows/
+└── workflows/                   # GitHub Actions 워크플로우
     └── backend-cicd.yaml
 ```
 
+### 파이프라인 워크플로우
+1. **Build & Test**: Gradle 빌드 및 단위 테스트
+2. **SonarQube Analysis**: 코드 품질 분석 (선택적)
+3. **Container Build & Push**: 환경별 이미지 빌드 및 ACR 푸시
+4. **Kustomize Deploy**: 환경별 매니페스트 적용
+
 ## ⚙️ GitHub Repository 설정
 
 ### 1. Repository Secrets 설정
 
-Repository Settings > Secrets and variables > Actions > Repository secrets에 다음을 등록:
+GitHub Repository > Settings > Secrets and variables > Actions > Repository secrets에 다음 항목들을 등록하세요:
 
-```yaml
-# Azure Service Principal
+#### Azure 인증 정보
+```json
 AZURE_CREDENTIALS:
 {
-  "clientId": "{클라이언트ID}",
-  "clientSecret": "{클라이언트시크릿}",
-  "subscriptionId": "{구독ID}",
-  "tenantId": "{테넌트ID}"
+  "clientId": "5e4b5b41-7208-48b7-b821-d6d5acf50ecf",
+  "clientSecret": "ldu8Q~GQEzFYU.dJX7_QsahR7n7C2xqkIM6hqbV8",
+  "subscriptionId": "2513dd36-7978-48e3-9a7c-b221d4874f66",
+  "tenantId": "4f0a3bfd-1156-4cce-8dc2-a049a13dba23"
 }
+```
 
-# ACR Credentials
+#### ACR Credentials
+```bash
+# ACR 자격 증명 확인 명령어
+az acr credential show --name acrdigitalgarage01
+```
+```
 ACR_USERNAME: acrdigitalgarage01
 ACR_PASSWORD: {ACR패스워드}
+```
 
-# Docker Hub (Rate Limit 해결용)
+#### SonarQube 설정
+```bash
+# SonarQube URL 확인
+kubectl get svc -n sonarqube
+```
+```
+SONAR_HOST_URL: http://{External IP}
+SONAR_TOKEN: {SonarQube토큰}
+```
+
+**SonarQube 토큰 생성 방법**:
+1. SonarQube 로그인 후 우측 상단 'Administrator' > My Account 클릭
+2. Security 탭 선택 후 토큰 생성
+
+#### Docker Hub 설정 (Rate Limit 해결)
+```
 DOCKERHUB_USERNAME: {Docker Hub 사용자명}
 DOCKERHUB_PASSWORD: {Docker Hub 패스워드}
-
-# SonarQube (선택사항)
-SONAR_TOKEN: {SonarQube토큰}
-SONAR_HOST_URL: {SonarQube서버URL}
 ```
 
 ### 2. Repository Variables 설정
 
-Repository Settings > Secrets and variables > Actions > Variables > Repository variables에 등록:
+GitHub Repository > Settings > Secrets and variables > Actions > Variables > Repository variables에 등록:
 
-```yaml
-ENVIRONMENT: dev  # 기본값
-SKIP_SONARQUBE: true  # 기본값
+```
+ENVIRONMENT: dev
+SKIP_SONARQUBE: true
 ```
 
-### 3. ACR 패스워드 확인 방법
+## 🚀 파이프라인 실행 방법
 
+### 자동 실행
+- **Push/PR 트리거**: main, develop 브랜치로 push시 자동 실행
+- **기본 설정**: ENVIRONMENT=dev, SKIP_SONARQUBE=true
+
+### 수동 실행
+1. GitHub Repository > Actions 탭
+2. "Backend Services CI/CD" 워크플로우 선택
+3. "Run workflow" 버튼 클릭
+4. 환경 선택 (dev/staging/prod)
+5. SonarQube 분석 여부 선택 (true/false)
+
+## 📦 배포 환경별 설정
+
+### DEV 환경
+- **Namespace**: phonebill-dev
+- **Replicas**: 모든 서비스 1개
+- **Resources**: CPU 256m/1024m, Memory 256Mi/1024Mi
+- **Profile**: dev (DDL_AUTO: update)
+- **SSL**: 비활성화
+
+### STAGING 환경
+- **Namespace**: phonebill-staging
+- **Replicas**: 모든 서비스 2개
+- **Resources**: CPU 512m/2048m, Memory 512Mi/2048Mi
+- **Profile**: staging (DDL_AUTO: validate)
+- **SSL**: 활성화
+
+### PROD 환경
+- **Namespace**: phonebill-prod
+- **Replicas**: 모든 서비스 3개
+- **Resources**: CPU 1024m/4096m, Memory 1024Mi/4096Mi
+- **Profile**: prod (DDL_AUTO: validate, 짧은 JWT)
+- **SSL**: 활성화
+
+## 🔧 수동 배포 방법
+
+### 스크립트를 이용한 배포
 ```bash
-az acr credential show --name acrdigitalgarage01
+# 기본 (dev 환경, latest 태그)
+./.github/scripts/deploy-actions.sh
+
+# 특정 환경과 태그 지정
+./.github/scripts/deploy-actions.sh staging 20241215143022
 ```
 
-## 🚀 CI/CD 파이프라인 구성
-
-### 워크플로우 트리거
-
-1. **자동 실행**:
-   - `main`, `develop` 브랜치에 Push
-   - `main` 브랜치로 Pull Request
-
-2. **수동 실행**:
-   - Actions 탭 > "Backend Services CI/CD" > "Run workflow"
-   - 환경 선택: dev/staging/prod
-   - SonarQube 분석 여부 선택
-
-### 파이프라인 단계
-
-#### 1. Build and Test
-- Gradle 빌드 (테스트 제외)
-- SonarQube 분석 (선택적)
-- 빌드 아티팩트 업로드
-
-#### 2. Build and Push Docker Images
-- Docker 이미지 빌드
-- ACR에 푸시 (태그: {environment}-{timestamp})
-
-#### 3. Deploy to Kubernetes
-- Kustomize를 이용한 환경별 배포
-- 배포 상태 확인
-- Health Check
-
-## 🔧 환경별 설정
-
-### 개발 환경 (dev)
-- **네임스페이스**: phonebill-dev
-- **Replicas**: 1
-- **Resources**: 256Mi/256m → 1024Mi/1024m
-- **DDL**: update
-- **Host**: phonebill-api.20.214.196.128.nip.io
-- **SSL**: false
-
-### 스테이징 환경 (staging)
-- **네임스페이스**: phonebill-staging
-- **Replicas**: 2
-- **Resources**: 512Mi/512m → 2048Mi/2048m
-- **DDL**: validate
-- **Host**: staging.phonebill.com
-- **SSL**: true (Let's Encrypt)
-
-### 운영 환경 (prod)
-- **네임스페이스**: phonebill-prod
-- **Replicas**: 3
-- **Resources**: 1024Mi/1024m → 4096Mi/4096m
-- **DDL**: validate
-- **JWT Token**: 1시간 (보안 강화)
-- **Host**: phonebill.com
-- **SSL**: true (Let's Encrypt)
-
-## 📝 수동 배포 방법
-
-### 스크립트 사용
+### kubectl을 이용한 직접 배포
 ```bash
-# 개발 환경 배포
-./.github/scripts/deploy-actions.sh dev latest
+# Kustomize 설치
+curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+sudo mv kustomize /usr/local/bin/
 
-# 스테이징 환경 배포
-./.github/scripts/deploy-actions.sh staging 20241215123456
-
-# 운영 환경 배포
-./.github/scripts/deploy-actions.sh prod 20241215123456
-```
-
-### kubectl 직접 사용
-```bash
-# 환경별 디렉토리로 이동
+# 환경별 배포
 cd .github/kustomize/overlays/dev
-
-# 이미지 태그 업데이트
-kustomize edit set image acrdigitalgarage01.azurecr.io/phonebill/api-gateway:dev-20241215123456
-
-# 배포 실행
 kubectl apply -k .
 ```
 
@@ -185,119 +167,91 @@ kubectl apply -k .
 
 ### 2. kubectl을 이용한 롤백
 ```bash
-# 특정 버전으로 롤백
-kubectl rollout undo deployment/api-gateway -n phonebill-dev --to-revision=2
+# 이전 버전으로 롤백
+kubectl rollout undo deployment/user-service -n phonebill-dev --to-revision=2
 
 # 롤백 상태 확인
-kubectl rollout status deployment/api-gateway -n phonebill-dev
+kubectl rollout status deployment/user-service -n phonebill-dev
 ```
 
 ### 3. 수동 스크립트를 이용한 롤백
 ```bash
-# 이전 안정 버전 이미지 태그로 배포
-./.github/scripts/deploy-actions.sh dev 20241214123456
+# 이전 안정 버전 태그로 배포
+./.github/scripts/deploy-actions.sh dev 20241215140000
 ```
 
-## 🔍 SonarQube 설정
+## 📊 SonarQube Quality Gate 설정
 
-### Quality Gate 기준
-- Coverage: >= 80%
-- Duplicated Lines: <= 3%
-- Maintainability Rating: <= A
-- Reliability Rating: <= A
-- Security Rating: <= A
+각 서비스별 SonarQube 프로젝트에서 다음 Quality Gate 설정:
 
-### 프로젝트 생성
-각 서비스별로 `phonebill-{service}-{environment}` 형식으로 프로젝트 생성
+```
+Coverage: >= 80%
+Duplicated Lines: <= 3%
+Maintainability Rating: <= A
+Reliability Rating: <= A
+Security Rating: <= A
+```
 
-## 📊 모니터링 및 확인
+## 🐛 트러블슈팅
 
-### 배포 상태 확인
+### 1. Kustomize 빌드 실패
 ```bash
-# Pod 상태 확인
+# Base 매니페스트 검증
+kubectl kustomize .github/kustomize/base/
+
+# 환경별 오버레이 검증
+kubectl kustomize .github/kustomize/overlays/dev/
+```
+
+### 2. 이미지 Pull 실패
+- ACR 자격 증명 확인
+- ImagePullSecret 설정 확인
+
+### 3. 배포 타임아웃
+```bash
+# 배포 상태 확인
 kubectl get pods -n phonebill-dev
 
-# 서비스 상태 확인
-kubectl get services -n phonebill-dev
-
-# Ingress 확인
-kubectl get ingress -n phonebill-dev
-
 # 로그 확인
-kubectl logs -f deployment/api-gateway -n phonebill-dev
+kubectl logs -f deployment/user-service -n phonebill-dev
 ```
 
-### Health Check
+### 4. SonarQube 연결 실패
+- SONAR_HOST_URL과 SONAR_TOKEN 확인
+- SonarQube 서버 상태 확인
+
+## 📋 체크리스트
+
+### 배포 전 확인사항
+- [ ] GitHub Secrets 모든 항목 설정 완료
+- [ ] Repository Variables 설정 완료
+- [ ] ACR 접근 권한 확인
+- [ ] AKS 클러스터 접근 권한 확인
+- [ ] SonarQube 서버 상태 확인 (분석 수행시)
+
+### 배포 후 확인사항
+- [ ] 모든 Pod가 Running 상태인지 확인
+- [ ] Service와 Ingress가 정상적으로 생성되었는지 확인
+- [ ] Health Check 엔드포인트 응답 확인
+- [ ] 로그에 에러가 없는지 확인
+
+## 📞 지원 및 연락처
+
+문제 발생시 다음 명령어로 디버깅 정보를 수집하여 지원팀에 문의하세요:
+
 ```bash
-# API Gateway Health Check
-kubectl -n phonebill-dev exec deployment/api-gateway -- curl -f http://localhost:8080/actuator/health
+# 시스템 상태 확인
+kubectl get all -n phonebill-{환경}
+
+# 로그 수집
+kubectl logs -l app.kubernetes.io/name=user-service -n phonebill-{환경}
+
+# 이벤트 확인
+kubectl get events -n phonebill-{환경} --sort-by='.lastTimestamp'
 ```
 
-## ⚠️ 주의사항
-
-1. **환경별 Secret 관리**:
-   - 현재는 동일한 값으로 설정되어 있음
-   - 실제 운영 시 환경별로 다른 값 설정 필요
-
-2. **도메인 설정**:
-   - staging/prod 환경의 도메인은 실제 구매한 도메인으로 변경 필요
-   - SSL 인증서는 cert-manager 설정 필요
-
-3. **리소스 한계**:
-   - 환경별 리소스 설정은 실제 부하에 맞게 조정 필요
-
-4. **데이터베이스 연결**:
-   - 환경별로 다른 데이터베이스 인스턴스 사용 권장
-
-## 🔧 문제 해결
-
-### 일반적인 문제들
-
-1. **이미지 Pull 실패**:
-   ```bash
-   # Secret 확인
-   kubectl get secret secret-imagepull -n phonebill-dev -o yaml
-   ```
-
-2. **ConfigMap/Secret 업데이트 반영 안됨**:
-   ```bash
-   # Pod 재시작
-   kubectl rollout restart deployment/api-gateway -n phonebill-dev
-   ```
-
-3. **Ingress IP 할당 안됨**:
-   ```bash
-   # Ingress Controller 상태 확인
-   kubectl get pods -n ingress-nginx
-   ```
-
-## 📚 참고 자료
-
-- [Kustomize 공식 문서](https://kustomize.io/)
-- [GitHub Actions 문서](https://docs.github.com/en/actions)
-- [Azure Container Registry 문서](https://docs.microsoft.com/en-us/azure/container-registry/)
-- [Azure Kubernetes Service 문서](https://docs.microsoft.com/en-us/azure/aks/)
-
 ---
 
-## 체크리스트
+✅ **GitHub Actions CI/CD 파이프라인 구축이 완료되었습니다!**
 
-### 초기 설정
-- [ ] GitHub Repository Secrets 설정 완료
-- [ ] GitHub Repository Variables 설정 완료
-- [ ] Azure Service Principal 생성 및 권한 설정
-- [ ] ACR 접근 권한 확인
-
-### 배포 테스트
-- [ ] 개발 환경 배포 성공
-- [ ] 스테이징 환경 배포 성공
-- [ ] 운영 환경 배포 성공
-- [ ] Health Check 통과
-- [ ] 롤백 테스트 성공
-
-### 모니터링 설정
-- [ ] SonarQube 프로젝트 생성
-- [ ] Quality Gate 설정
-- [ ] 알림 설정 (선택사항)
-
-이 가이드를 통해 GitHub Actions 기반의 완전 자동화된 CI/CD 파이프라인을 구축할 수 있습니다.
\ No newline at end of file
+이제 코드를 푸시하거나 수동으로 워크플로우를 실행하여 자동 배포를 테스트할 수 있습니다.
\ No newline at end of file
diff --git a/.github/kustomize/base/kustomization.yaml b/.github/kustomize/base/kustomization.yaml
index fcb04db..ce6062a 100644
--- a/.github/kustomize/base/kustomization.yaml
+++ b/.github/kustomize/base/kustomization.yaml
@@ -7,38 +7,40 @@ metadata:
 resources:
   # Common resources
   - namespace.yaml
+  - common/ingress.yaml
   - common/cm-common.yaml
   - common/secret-common.yaml
   - common/secret-imagepull.yaml
-  - common/ingress.yaml
 
-  # API Gateway service
+  # API Gateway
   - api-gateway/deployment.yaml
   - api-gateway/service.yaml
   - api-gateway/cm-api-gateway.yaml
+  - api-gateway/secret-api-gateway.yaml
 
-  # User service
+  # User Service
   - user-service/deployment.yaml
   - user-service/service.yaml
   - user-service/cm-user-service.yaml
   - user-service/secret-user-service.yaml
 
-  # Bill service
+  # Bill Service
   - bill-service/deployment.yaml
   - bill-service/service.yaml
   - bill-service/cm-bill-service.yaml
   - bill-service/secret-bill-service.yaml
 
-  # Product service
+  # Product Service
   - product-service/deployment.yaml
   - product-service/service.yaml
   - product-service/cm-product-service.yaml
   - product-service/secret-product-service.yaml
 
-  # KOS Mock service
+  # KOS Mock Service
   - kos-mock/deployment.yaml
   - kos-mock/service.yaml
   - kos-mock/cm-kos-mock.yaml
+  - kos-mock/secret-kos-mock.yaml
 
 images:
   - name: acrdigitalgarage01.azurecr.io/phonebill/api-gateway
diff --git a/.github/kustomize/base/namespace.yaml b/.github/kustomize/base/namespace.yaml
index b690784..e0edb58 100644
--- a/.github/kustomize/base/namespace.yaml
+++ b/.github/kustomize/base/namespace.yaml
@@ -1,4 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: phonebill-default
\ No newline at end of file
+  name: phonebill
+  labels:
+    name: phonebill
\ No newline at end of file
diff --git a/.github/kustomize/overlays/dev/cm-common-patch.yaml b/.github/kustomize/overlays/dev/cm-common-patch.yaml
index a96b039..0511102 100644
--- a/.github/kustomize/overlays/dev/cm-common-patch.yaml
+++ b/.github/kustomize/overlays/dev/cm-common-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cm-common
-  
 data:
   CORS_ALLOWED_ORIGINS: "http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084,http://phonebill.20.214.196.128.nip.io"
   JWT_ACCESS_TOKEN_VALIDITY: "18000000"
diff --git a/.github/kustomize/overlays/dev/ingress-patch.yaml b/.github/kustomize/overlays/dev/ingress-patch.yaml
index b2bf566..3c5cec7 100644
--- a/.github/kustomize/overlays/dev/ingress-patch.yaml
+++ b/.github/kustomize/overlays/dev/ingress-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: phonebill
-  
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
diff --git a/.github/kustomize/overlays/dev/kustomization.yaml b/.github/kustomize/overlays/dev/kustomization.yaml
index 98de2ab..4ba4b35 100644
--- a/.github/kustomize/overlays/dev/kustomization.yaml
+++ b/.github/kustomize/overlays/dev/kustomization.yaml
@@ -39,6 +39,10 @@ patches:
     target:
       kind: Deployment
       name: kos-mock
+  - path: secret-api-gateway-patch.yaml
+    target:
+      kind: Secret
+      name: secret-api-gateway
   - path: secret-user-service-patch.yaml
     target:
       kind: Secret
@@ -51,6 +55,10 @@ patches:
     target:
       kind: Secret
       name: secret-product-service
+  - path: secret-kos-mock-patch.yaml
+    target:
+      kind: Secret
+      name: secret-kos-mock
 
 images:
   - name: acrdigitalgarage01.azurecr.io/phonebill/api-gateway
diff --git a/.github/kustomize/overlays/dev/secret-api-gateway-patch.yaml b/.github/kustomize/overlays/dev/secret-api-gateway-patch.yaml
new file mode 100644
index 0000000..ff57af8
--- /dev/null
+++ b/.github/kustomize/overlays/dev/secret-api-gateway-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-api-gateway
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/dev/secret-common-patch.yaml b/.github/kustomize/overlays/dev/secret-common-patch.yaml
index c21c3ea..b641d81 100644
--- a/.github/kustomize/overlays/dev/secret-common-patch.yaml
+++ b/.github/kustomize/overlays/dev/secret-common-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: secret-common
-  
 type: Opaque
 stringData:
   JWT_SECRET: "nwe5Yo9qaJ6FBD/Thl2/j6/SFAfNwUorAY1ZcWO2KI7uA4bmVLOCPxE9hYuUpRCOkgV2UF2DdHXtqHi3+BU/ecbz2zpHyf/720h48UbA3XOMYOX1sdM+dQ=="
diff --git a/.github/kustomize/overlays/dev/secret-kos-mock-patch.yaml b/.github/kustomize/overlays/dev/secret-kos-mock-patch.yaml
new file mode 100644
index 0000000..13cef26
--- /dev/null
+++ b/.github/kustomize/overlays/dev/secret-kos-mock-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-kos-mock
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/cm-common-patch.yaml b/.github/kustomize/overlays/prod/cm-common-patch.yaml
index b7f9b80..0511102 100644
--- a/.github/kustomize/overlays/prod/cm-common-patch.yaml
+++ b/.github/kustomize/overlays/prod/cm-common-patch.yaml
@@ -2,11 +2,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cm-common
-  
 data:
   CORS_ALLOWED_ORIGINS: "http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084,http://phonebill.20.214.196.128.nip.io"
-  JWT_ACCESS_TOKEN_VALIDITY: "3600000"
+  JWT_ACCESS_TOKEN_VALIDITY: "18000000"
   JWT_REFRESH_TOKEN_VALIDITY: "86400000"
   REDIS_PORT: "6379"
-  SPRING_PROFILES_ACTIVE: "prod"
-  DDL_AUTO: "validate"
\ No newline at end of file
+  SPRING_PROFILES_ACTIVE: "dev"
+  DDL_AUTO: "update"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/deployment-api-gateway-patch.yaml b/.github/kustomize/overlays/prod/deployment-api-gateway-patch.yaml
index e1aa47d..a0bdaec 100644
--- a/.github/kustomize/overlays/prod/deployment-api-gateway-patch.yaml
+++ b/.github/kustomize/overlays/prod/deployment-api-gateway-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: api-gateway
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:
       - name: api-gateway
         resources:
           requests:
-            memory: "1024Mi"
-            cpu: "1024m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "4096Mi"
-            cpu: "4096m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/deployment-bill-service-patch.yaml b/.github/kustomize/overlays/prod/deployment-bill-service-patch.yaml
index 8ea7b73..bde12ae 100644
--- a/.github/kustomize/overlays/prod/deployment-bill-service-patch.yaml
+++ b/.github/kustomize/overlays/prod/deployment-bill-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: bill-service
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:
       - name: bill-service
         resources:
           requests:
-            memory: "1024Mi"
-            cpu: "1024m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "4096Mi"
-            cpu: "4096m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/deployment-kos-mock-patch.yaml b/.github/kustomize/overlays/prod/deployment-kos-mock-patch.yaml
index 4fb4bc9..ab3676b 100644
--- a/.github/kustomize/overlays/prod/deployment-kos-mock-patch.yaml
+++ b/.github/kustomize/overlays/prod/deployment-kos-mock-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: kos-mock
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:
       - name: kos-mock
         resources:
           requests:
-            memory: "1024Mi"
-            cpu: "1024m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "4096Mi"
-            cpu: "4096m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/deployment-product-service-patch.yaml b/.github/kustomize/overlays/prod/deployment-product-service-patch.yaml
index f7f7b00..ed481ca 100644
--- a/.github/kustomize/overlays/prod/deployment-product-service-patch.yaml
+++ b/.github/kustomize/overlays/prod/deployment-product-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: product-service
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:
       - name: product-service
         resources:
           requests:
-            memory: "1024Mi"
-            cpu: "1024m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "4096Mi"
-            cpu: "4096m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/deployment-user-service-patch.yaml b/.github/kustomize/overlays/prod/deployment-user-service-patch.yaml
index 6ce746f..611c4e3 100644
--- a/.github/kustomize/overlays/prod/deployment-user-service-patch.yaml
+++ b/.github/kustomize/overlays/prod/deployment-user-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: user-service
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:
       - name: user-service
         resources:
           requests:
-            memory: "1024Mi"
-            cpu: "1024m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "4096Mi"
-            cpu: "4096m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/ingress-patch.yaml b/.github/kustomize/overlays/prod/ingress-patch.yaml
index f7f9ada..3c5cec7 100644
--- a/.github/kustomize/overlays/prod/ingress-patch.yaml
+++ b/.github/kustomize/overlays/prod/ingress-patch.yaml
@@ -4,16 +4,11 @@ metadata:
   name: phonebill
   annotations:
     kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
   ingressClassName: nginx
-  tls:
-  - hosts:
-    - phonebill.com
-    secretName: prod-phonebill-tls
   rules:
-  - host: phonebill.com
+  - host: phonebill-api.20.214.196.128.nip.io
     http:
       paths:
       - path: /api/v1/auth
diff --git a/.github/kustomize/overlays/prod/kustomization.yaml b/.github/kustomize/overlays/prod/kustomization.yaml
index 91ba3a6..c80f95e 100644
--- a/.github/kustomize/overlays/prod/kustomization.yaml
+++ b/.github/kustomize/overlays/prod/kustomization.yaml
@@ -39,6 +39,10 @@ patches:
     target:
       kind: Deployment
       name: kos-mock
+  - path: secret-api-gateway-patch.yaml
+    target:
+      kind: Secret
+      name: secret-api-gateway
   - path: secret-user-service-patch.yaml
     target:
       kind: Secret
@@ -51,6 +55,10 @@ patches:
     target:
       kind: Secret
       name: secret-product-service
+  - path: secret-kos-mock-patch.yaml
+    target:
+      kind: Secret
+      name: secret-kos-mock
 
 images:
   - name: acrdigitalgarage01.azurecr.io/phonebill/api-gateway
diff --git a/.github/kustomize/overlays/prod/secret-api-gateway-patch.yaml b/.github/kustomize/overlays/prod/secret-api-gateway-patch.yaml
new file mode 100644
index 0000000..ff57af8
--- /dev/null
+++ b/.github/kustomize/overlays/prod/secret-api-gateway-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-api-gateway
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/prod/secret-common-patch.yaml b/.github/kustomize/overlays/prod/secret-common-patch.yaml
index c21c3ea..b641d81 100644
--- a/.github/kustomize/overlays/prod/secret-common-patch.yaml
+++ b/.github/kustomize/overlays/prod/secret-common-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: secret-common
-  
 type: Opaque
 stringData:
   JWT_SECRET: "nwe5Yo9qaJ6FBD/Thl2/j6/SFAfNwUorAY1ZcWO2KI7uA4bmVLOCPxE9hYuUpRCOkgV2UF2DdHXtqHi3+BU/ecbz2zpHyf/720h48UbA3XOMYOX1sdM+dQ=="
diff --git a/.github/kustomize/overlays/prod/secret-kos-mock-patch.yaml b/.github/kustomize/overlays/prod/secret-kos-mock-patch.yaml
new file mode 100644
index 0000000..13cef26
--- /dev/null
+++ b/.github/kustomize/overlays/prod/secret-kos-mock-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-kos-mock
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/cm-common-patch.yaml b/.github/kustomize/overlays/staging/cm-common-patch.yaml
index 1b70721..0511102 100644
--- a/.github/kustomize/overlays/staging/cm-common-patch.yaml
+++ b/.github/kustomize/overlays/staging/cm-common-patch.yaml
@@ -2,11 +2,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cm-common
-  
 data:
   CORS_ALLOWED_ORIGINS: "http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084,http://phonebill.20.214.196.128.nip.io"
   JWT_ACCESS_TOKEN_VALIDITY: "18000000"
   JWT_REFRESH_TOKEN_VALIDITY: "86400000"
   REDIS_PORT: "6379"
-  SPRING_PROFILES_ACTIVE: "staging"
-  DDL_AUTO: "validate"
\ No newline at end of file
+  SPRING_PROFILES_ACTIVE: "dev"
+  DDL_AUTO: "update"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/deployment-api-gateway-patch.yaml b/.github/kustomize/overlays/staging/deployment-api-gateway-patch.yaml
index db065e1..a0bdaec 100644
--- a/.github/kustomize/overlays/staging/deployment-api-gateway-patch.yaml
+++ b/.github/kustomize/overlays/staging/deployment-api-gateway-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: api-gateway
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
       containers:
       - name: api-gateway
         resources:
           requests:
-            memory: "512Mi"
-            cpu: "512m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "2048Mi"
-            cpu: "2048m"
\ No newline at end of file
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/deployment-bill-service-patch.yaml b/.github/kustomize/overlays/staging/deployment-bill-service-patch.yaml
index 4ebd2d2..bde12ae 100644
--- a/.github/kustomize/overlays/staging/deployment-bill-service-patch.yaml
+++ b/.github/kustomize/overlays/staging/deployment-bill-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: bill-service
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
       containers:
       - name: bill-service
         resources:
           requests:
-            memory: "512Mi"
-            cpu: "512m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "2048Mi"
-            cpu: "2048m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/deployment-kos-mock-patch.yaml b/.github/kustomize/overlays/staging/deployment-kos-mock-patch.yaml
index cc30074..ab3676b 100644
--- a/.github/kustomize/overlays/staging/deployment-kos-mock-patch.yaml
+++ b/.github/kustomize/overlays/staging/deployment-kos-mock-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: kos-mock
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
       containers:
       - name: kos-mock
         resources:
           requests:
-            memory: "512Mi"
-            cpu: "512m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "2048Mi"
-            cpu: "2048m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/deployment-product-service-patch.yaml b/.github/kustomize/overlays/staging/deployment-product-service-patch.yaml
index 2bf8c00..ed481ca 100644
--- a/.github/kustomize/overlays/staging/deployment-product-service-patch.yaml
+++ b/.github/kustomize/overlays/staging/deployment-product-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: product-service
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
       containers:
       - name: product-service
         resources:
           requests:
-            memory: "512Mi"
-            cpu: "512m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "2048Mi"
-            cpu: "2048m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/deployment-user-service-patch.yaml b/.github/kustomize/overlays/staging/deployment-user-service-patch.yaml
index 2a75059..611c4e3 100644
--- a/.github/kustomize/overlays/staging/deployment-user-service-patch.yaml
+++ b/.github/kustomize/overlays/staging/deployment-user-service-patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: user-service
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
       containers:
       - name: user-service
         resources:
           requests:
-            memory: "512Mi"
-            cpu: "512m"
+            memory: "256Mi"
+            cpu: "256m"
           limits:
-            memory: "2048Mi"
-            cpu: "2048m"
+            memory: "1024Mi"
+            cpu: "1024m"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/ingress-patch.yaml b/.github/kustomize/overlays/staging/ingress-patch.yaml
index 152a2b6..3c5cec7 100644
--- a/.github/kustomize/overlays/staging/ingress-patch.yaml
+++ b/.github/kustomize/overlays/staging/ingress-patch.yaml
@@ -4,16 +4,11 @@ metadata:
   name: phonebill
   annotations:
     kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
   ingressClassName: nginx
-  tls:
-  - hosts:
-    - staging.phonebill.com
-    secretName: staging-phonebill-tls
   rules:
-  - host: staging.phonebill.com
+  - host: phonebill-api.20.214.196.128.nip.io
     http:
       paths:
       - path: /api/v1/auth
diff --git a/.github/kustomize/overlays/staging/kustomization.yaml b/.github/kustomize/overlays/staging/kustomization.yaml
index daffaa8..de16689 100644
--- a/.github/kustomize/overlays/staging/kustomization.yaml
+++ b/.github/kustomize/overlays/staging/kustomization.yaml
@@ -39,6 +39,10 @@ patches:
     target:
       kind: Deployment
       name: kos-mock
+  - path: secret-api-gateway-patch.yaml
+    target:
+      kind: Secret
+      name: secret-api-gateway
   - path: secret-user-service-patch.yaml
     target:
       kind: Secret
@@ -51,6 +55,10 @@ patches:
     target:
       kind: Secret
       name: secret-product-service
+  - path: secret-kos-mock-patch.yaml
+    target:
+      kind: Secret
+      name: secret-kos-mock
 
 images:
   - name: acrdigitalgarage01.azurecr.io/phonebill/api-gateway
diff --git a/.github/kustomize/overlays/staging/secret-api-gateway-patch.yaml b/.github/kustomize/overlays/staging/secret-api-gateway-patch.yaml
new file mode 100644
index 0000000..ff57af8
--- /dev/null
+++ b/.github/kustomize/overlays/staging/secret-api-gateway-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-api-gateway
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/kustomize/overlays/staging/secret-common-patch.yaml b/.github/kustomize/overlays/staging/secret-common-patch.yaml
index c21c3ea..b641d81 100644
--- a/.github/kustomize/overlays/staging/secret-common-patch.yaml
+++ b/.github/kustomize/overlays/staging/secret-common-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: secret-common
-  
 type: Opaque
 stringData:
   JWT_SECRET: "nwe5Yo9qaJ6FBD/Thl2/j6/SFAfNwUorAY1ZcWO2KI7uA4bmVLOCPxE9hYuUpRCOkgV2UF2DdHXtqHi3+BU/ecbz2zpHyf/720h48UbA3XOMYOX1sdM+dQ=="
diff --git a/.github/kustomize/overlays/staging/secret-kos-mock-patch.yaml b/.github/kustomize/overlays/staging/secret-kos-mock-patch.yaml
new file mode 100644
index 0000000..13cef26
--- /dev/null
+++ b/.github/kustomize/overlays/staging/secret-kos-mock-patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-kos-mock
+type: Opaque
+stringData:
+  PLACEHOLDER: "dev-value"
\ No newline at end of file
diff --git a/.github/workflows/backend-cicd.yaml b/.github/workflows/backend-cicd.yaml
index def6f78..c168d0c 100644
--- a/.github/workflows/backend-cicd.yaml
+++ b/.github/workflows/backend-cicd.yaml
@@ -271,22 +271,4 @@ jobs:
           kubectl -n phonebill-${{ env.ENVIRONMENT }} wait --for=condition=available deployment/user-service --timeout=300s
           kubectl -n phonebill-${{ env.ENVIRONMENT }} wait --for=condition=available deployment/bill-service --timeout=300s
           kubectl -n phonebill-${{ env.ENVIRONMENT }} wait --for=condition=available deployment/product-service --timeout=300s
-          kubectl -n phonebill-${{ env.ENVIRONMENT }} wait --for=condition=available deployment/kos-mock --timeout=300s
-
-      - name: Health Check
-        run: |
-          echo "🔍 Health Check starting..."
-
-          # API Gateway Health Check
-          GATEWAY_POD=$(kubectl get pod -n phonebill-${{ env.ENVIRONMENT }} -l app.kubernetes.io/name=api-gateway -o jsonpath='{.items[0].metadata.name}')
-          kubectl -n phonebill-${{ env.ENVIRONMENT }} exec $GATEWAY_POD -- curl -f http://localhost:8080/actuator/health || exit 1
-
-          echo "✅ All services are healthy!"
-
-      - name: Get service information
-        run: |
-          echo "📋 Service Information:"
-          kubectl get pods -n phonebill-${{ env.ENVIRONMENT }}
-          kubectl get services -n phonebill-${{ env.ENVIRONMENT }}
-          kubectl get ingress -n phonebill-${{ env.ENVIRONMENT }}
-          echo "Ingress IP: $(kubectl -n phonebill-${{ env.ENVIRONMENT }} get ingress phonebill -o jsonpath='{.status.loadBalancer.ingress[0].ip}' 2>/dev/null || echo 'Pending')"
\ No newline at end of file
+          kubectl -n phonebill-${{ env.ENVIRONMENT }} wait --for=condition=available deployment/kos-mock --timeout=300s
\ No newline at end of file