diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml
index 9b2bf65..4ae97c6 100644
--- a/.github/workflows/swagger-json.yml
+++ b/.github/workflows/swagger-json.yml
@@ -97,7 +97,7 @@ jobs:
         with:
           token: ${{ secrets.DOCS_REPO_TOKEN }}
           path: amrit-docs
-          branch: auto/swagger-update-${{ github.run_id }}-${{ github.run_attempt }}
+          branch: auto/swagger-update-admin-api
           base: main
           commit-message: "chore(docs): auto-update Admin-API swagger"
           title: "chore(docs): auto-update Admin-API swagger"
diff --git a/src/main/java/com/iemr/admin/config/SwaggerConfig.java b/src/main/java/com/iemr/admin/config/SwaggerConfig.java
index c3a09c7..f87b63b 100644
--- a/src/main/java/com/iemr/admin/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/admin/config/SwaggerConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -10,15 +11,25 @@
 import io.swagger.v3.oas.models.security.SecurityScheme;
 
 @Configuration
+
 public class SwaggerConfig {
-	
-	@Bean
-    public OpenAPI customOpenAPI() {
-        return new OpenAPI().info(new 
-             Info().title("Admin API").version("version").description("A microservice for the creation and management of beneficiaries."))
-                .addSecurityItem(new SecurityRequirement().addList("my security"))
-                .components(new Components().addSecuritySchemes("my security",
-                        new SecurityScheme().name("my security").type(SecurityScheme.Type.HTTP).scheme("bearer")));
+    private static final String DEFAULT_SERVER_URL = "http://localhost:9090";
+
+    @Bean
+    public OpenAPI customOpenAPI(Environment env) {
+        String devUrl = env.getProperty("api.dev.url", DEFAULT_SERVER_URL);
+        String uatUrl = env.getProperty("api.uat.url", DEFAULT_SERVER_URL);
+        String demoUrl = env.getProperty("api.demo.url", DEFAULT_SERVER_URL);
+        return new OpenAPI()
+            .info(new Info().title("Admin API").version("version").description("Microservice for administration, configuration, user and role management, and service-level operations."))
+            .addSecurityItem(new SecurityRequirement().addList("my security"))
+            .components(new Components().addSecuritySchemes("my security",
+                new SecurityScheme().name("my security").type(SecurityScheme.Type.HTTP).scheme("bearer")))
+            .servers(java.util.Arrays.asList(
+                new io.swagger.v3.oas.models.servers.Server().url(devUrl).description("Dev"),
+                new io.swagger.v3.oas.models.servers.Server().url(uatUrl).description("UAT"),
+                new io.swagger.v3.oas.models.servers.Server().url(demoUrl).description("Demo")
+            ));
     }
 
 }
diff --git a/src/main/resources/application-swagger.properties b/src/main/resources/application-swagger.properties
index e9b44a9..7059d01 100644
--- a/src/main/resources/application-swagger.properties
+++ b/src/main/resources/application-swagger.properties
@@ -16,3 +16,8 @@ cors.allowed-origins=${CORS_ALLOWED_ORIGINS:http://localhost:9090,http://localho
 logging.level.root=INFO
 
 jwt.secret=JWT_SECRET
+
+# Swagger server URLs
+api.dev.url=${API_DEV_URL:https://amritwprdev.piramalswasthya.org}
+api.uat.url=${API_UAT_URL:https://uatamrit.piramalswasthya.org}
+api.demo.url=${API_DEMO_URL:https://amritdemo.piramalswasthya.org}