diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 84c70090..9e393ebc 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -160,6 +160,9 @@ grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
 springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
 
+
+isProduction=false
 grievanceAllocationRetryConfiguration=3
 
 
+
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index d59acb42..54e3e5da 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -186,4 +186,6 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
+isProduction=false
 grievanceAllocationRetryConfiguration=3
+
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index bcc6c6ca..f039b0d3 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -186,7 +186,7 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
+isProduction=false
 grievanceAllocationRetryConfiguration=3
 
 
-
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 169317db..79a0f9a1 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -187,5 +187,5 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
-
+isProduction=false
 grievanceAllocationRetryConfiguration=3
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index 0b55a003..718ff110 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -158,5 +158,5 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
-
+isProduction=false
 grievanceAllocationRetryConfiguration=3
diff --git a/src/main/java/com/iemr/common/utils/CookieUtil.java b/src/main/java/com/iemr/common/utils/CookieUtil.java
index 8c0a0b76..678f639c 100644
--- a/src/main/java/com/iemr/common/utils/CookieUtil.java
+++ b/src/main/java/com/iemr/common/utils/CookieUtil.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import jakarta.servlet.http.Cookie;
@@ -11,6 +12,9 @@
 
 @Service
 public class CookieUtil {
+	
+	@Value("${isProduction}")
+	private Boolean isProduction;
 
 	public Optional<String> getCookieValue(HttpServletRequest request, String cookieName) {
 		Cookie[] cookies = request.getCookies();
@@ -39,6 +43,9 @@ public void addJwtTokenToCookie(String Jwttoken, HttpServletResponse response, H
 	 
 	    // Set the SameSite attribute for cross-site request handling (if needed)
 	    String sameSite = "None"; // Allow cross-site cookies (can be 'Strict', 'Lax', or 'None')
+	    if(isProduction) {
+	    	sameSite= "Strict";
+	    }
 	    cookie.setSecure(true);
 	 
 	    // Build the Set-Cookie header manually (to add SameSite attribute support)