diff --git a/src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java
index af81ea3..6a4ea60 100644
--- a/src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java
+++ b/src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java
@@ -43,10 +43,13 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 			return;
 		}
 		String path = request.getRequestURI();
-		logger.info("JwtUserIdValidationFilter invoked for path: {}", path);
+		String servletPath = request.getServletPath();
+		logger.info("JwtUserIdValidationFilter invoked for requestURI: {}, servletPath: {}", path, servletPath);
 
 		// Skip JWT validation for public endpoints
-		if (path.equals("/health") || path.equals("/version")) {
+
+		if (servletPath.equals("/health") || servletPath.equals("/version") || 
+		    path.endsWith("/health") || path.endsWith("/version")) {
 			logger.info("Public endpoint accessed: {} - skipping JWT validation", path);
 			filterChain.doFilter(servletRequest, servletResponse);
 			return;