diff --git a/src/main/environment/ecd_ci.properties b/src/main/environment/ecd_ci.properties
index dfcfdb0..9df17e4 100644
--- a/src/main/environment/ecd_ci.properties
+++ b/src/main/environment/ecd_ci.properties
@@ -25,6 +25,6 @@ beneficiaryEditUrl =@env.COMMON_API@/beneficiary/update
 logging.file.name=@env.ECD_API_LOGGING_FILE_NAME@
 
 
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
+springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
+springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
diff --git a/src/main/environment/ecd_example.properties b/src/main/environment/ecd_example.properties
index bf43a4d..dd037f5 100644
--- a/src/main/environment/ecd_example.properties
+++ b/src/main/environment/ecd_example.properties
@@ -16,3 +16,7 @@ registerBeneficiaryUrl=https:localhost:8083/beneficiary/create
 
 ##Beneficiary Edit Url
 beneficiaryEditUrl =https:localhost:8083/beneficiary/update
+
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.enabled=true
+
diff --git a/src/main/environment/ecd_uat.properties b/src/main/environment/ecd_uat.properties
index 779e08f..b00f99b 100644
--- a/src/main/environment/ecd_uat.properties
+++ b/src/main/environment/ecd_uat.properties
@@ -22,3 +22,4 @@ jwt.secret=
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
+
diff --git a/src/main/java/com/iemr/ecd/utils/mapper/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/ecd/utils/mapper/JwtUserIdValidationFilter.java
index d7d1c09..e7d0115 100644
--- a/src/main/java/com/iemr/ecd/utils/mapper/JwtUserIdValidationFilter.java
+++ b/src/main/java/com/iemr/ecd/utils/mapper/JwtUserIdValidationFilter.java
@@ -55,6 +55,9 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 		// Skip login and public endpoints
 		if (path.equals(contextPath + "/user/userAuthenticate")
 				|| path.equalsIgnoreCase(contextPath + "/user/logOutUserFromConcurrentSession")
+				|| path.startsWith(contextPath + "/swagger-ui")
+				|| path.startsWith(contextPath + "/v3/api-docs")
+				|| path.startsWith(contextPath + "/user/refreshToken")
 				|| path.startsWith(contextPath + "/public")) {
 			logger.info("Skipping filter for path: " + path);
 			filterChain.doFilter(servletRequest, servletResponse);