diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml
new file mode 100644
index 0000000..17f5c33
--- /dev/null
+++ b/.github/workflows/swagger-json.yml
@@ -0,0 +1,107 @@
+name: Sync Swagger to AMRIT-Docs
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  swagger-sync:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout API repo
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: maven
+
+      - name: Build API (skip tests)
+        run: mvn -B clean package -DskipTests
+        
+      - name: Install jq
+        run: sudo apt-get update && sudo apt-get install -y jq
+
+      - name: Run API in swagger profile
+        run: |
+          mvn spring-boot:run \
+            -Dspring-boot.run.profiles=swagger \
+            -Dspring-boot.run.arguments=--server.port=9090 \
+            > app.log 2>&1 &
+          echo $! > api_pid.txt
+
+      - name: Wait for API & fetch Swagger
+        run: |
+          for i in {1..40}; do
+            CODE=$(curl --connect-timeout 2 --max-time 5 -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true)
+
+            if [ "$CODE" = "200" ]; then
+              jq . swagger_raw.json > ecd-api.json || {
+                echo "Swagger JSON invalid"
+                cat swagger_raw.json
+                exit 1
+              }
+
+              if [ "$(jq '.paths | length' ecd-api.json)" -eq 0 ]; then
+                echo "Swagger paths empty – failing"
+                exit 1
+              fi
+
+              echo "Swagger generated successfully"
+              exit 0
+            fi
+
+            echo "Waiting for API... ($i)"
+            sleep 4
+          done
+
+          echo "Swagger not generated"
+          cat app.log || true
+          exit 1
+
+      - name: Stop API
+        if: always()
+        run: |
+          # Graceful shutdown of the process group
+          sleep 5
+          # Force kill the process group if still running
+          if [ -f api_pid.txt ]; then
+              PID=$(cat api_pid.txt)
+              kill -TERM -- -"$PID" 2>/dev/null || true
+              sleep 2
+              kill -9 -- -"$PID" 2>/dev/null || true
+            fi
+            # Fallback: kill any remaining java process on port 9090
+            fuser -k 9090/tcp 2>/dev/null || true
+
+      - name: Checkout AMRIT-Docs
+        uses: actions/checkout@v4
+        with:
+          repository: PSMRI/AMRIT-Docs
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          path: amrit-docs
+          fetch-depth: 0
+
+      - name: Copy Swagger JSON
+        run: |
+          mkdir -p amrit-docs/docs/swagger
+          cp ecd-api.json amrit-docs/docs/swagger/ecd-api.json
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          path: amrit-docs
+          branch: auto/swagger-update-${{ github.run_id }}-${{ github.run_attempt }}
+          base: main
+          commit-message: "chore(docs): auto-update ECD-API swagger"
+          title: "chore(docs): auto-update ECD-API swagger"
+          delete-branch: true
+          body: |
+            This PR automatically updates ECD-API Swagger JSON
+            from the latest main branch build.
diff --git a/pom.xml b/pom.xml
index 978b9cd..82d20d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,6 +255,11 @@
 			<version>0.12.6</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
 
diff --git a/src/main/java/com/iemr/ecd/config/HttpInterceptorConfig.java b/src/main/java/com/iemr/ecd/config/HttpInterceptorConfig.java
index c400a8a..f89c38d 100644
--- a/src/main/java/com/iemr/ecd/config/HttpInterceptorConfig.java
+++ b/src/main/java/com/iemr/ecd/config/HttpInterceptorConfig.java
@@ -23,11 +23,13 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.iemr.ecd.utils.http_request_interceptor.HttpInterceptor;
 
+@Profile("!swagger")
 @Configuration
 public class HttpInterceptorConfig implements WebMvcConfigurer {
 
diff --git a/src/main/java/com/iemr/ecd/config/RedisConfig.java b/src/main/java/com/iemr/ecd/config/RedisConfig.java
index 58cd150..fb896f7 100644
--- a/src/main/java/com/iemr/ecd/config/RedisConfig.java
+++ b/src/main/java/com/iemr/ecd/config/RedisConfig.java
@@ -25,6 +25,7 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -33,6 +34,7 @@
 
 import com.iemr.ecd.dao.Users;
 
+@Profile("!swagger")
 @Configuration
 @EnableCaching
 public class RedisConfig {
diff --git a/src/main/resources/application-swagger.properties b/src/main/resources/application-swagger.properties
new file mode 100644
index 0000000..9fd6853
--- /dev/null
+++ b/src/main/resources/application-swagger.properties
@@ -0,0 +1,26 @@
+# Minimal properties for running ECD-API in swagger profile
+# Use H2 in-memory DB and disable security for OpenAPI doc generation
+
+spring.datasource.url=jdbc:h2:mem:swaggerdb
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+spring.jpa.hibernate.ddl-auto=create-drop
+
+# Disable Redis if not needed for docs (optional)
+spring.redis.host=localhost
+spring.redis.port=6379
+
+# CORS for Swagger UI
+cors.allowed-origins=${CORS_ALLOWED_ORIGINS:http://localhost:9090,http://localhost:8080}
+
+# Logging
+logging.level.root=INFO
+
+# Disable security auto-configuration (already excluded in main class)
+# If you have custom security beans, add @Profile("!swagger") to them
+
+jwt.secret=${JWT_SECRET_KEY:#{T(java.util.UUID).randomUUID().toString()}}
+registerBeneficiaryUrl=http://dummy-url
+beneficiaryEditUrl=http://dummy-edit-url