diff --git a/ci/terraform/oidc/production.tfvars b/ci/terraform/oidc/production.tfvars
index c18289eaac..f035911b06 100644
--- a/ci/terraform/oidc/production.tfvars
+++ b/ci/terraform/oidc/production.tfvars
@@ -55,4 +55,4 @@ orch_authentication_callback_enabled        = true
 orch_logout_enabled                         = true
 auth_spot_response_disabled                 = true
 orch_storage_token_jwk_enabled              = true
-is_destroy_orch_session_on_sign_out_enabled = false
+is_destroy_orch_session_on_sign_out_enabled = true
diff --git a/template.yaml b/template.yaml
index ccd95d9e17..8271f563ab 100644
--- a/template.yaml
+++ b/template.yaml
@@ -72,6 +72,7 @@ Conditions:
       !Equals [build, !Ref Environment],
       !Equals [staging, !Ref Environment],
       !Equals [integration, !Ref Environment],
+      !Equals [production, !Ref Environment],
     ]
   IsReturnAuthTimeInIdTokenEnabled:
     !Or [