diff --git a/entrypoint.sh b/entrypoint.sh
index 27827fe5e..3fac477ad 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -111,6 +111,13 @@ EOF
     password:
       pepper: "${AUTH_PASSWORD_PEPPER:?AUTH_PASSWORD_PEPPER is required}"
       iterations: ${AUTH_PASSWORD_ITERATIONS:-1000000}
+    saml:
+      session-duration: ${SAML_SESSION_DURATION:-604800}
+      cleanup-interval-seconds: ${SAML_CLEANUP_INTERVAL_SECONDS:-0}
+      certificate: |
+$(echo "${SAML_CERTIFICATE:-}" | sed 's/^/        /')
+      private-key: |
+$(echo "${SAML_PRIVATE_KEY:-}" | sed 's/^/        /')
 
   trust-auth:
     cookie-name: "${TRUST_AUTH_COOKIE_NAME:-TCT}"
@@ -178,18 +185,6 @@ EOF
 EOF
   fi
 
-  # Add SAML config if any SAML variable is configured
-    cat >> "$CONFIG_FILE" <<EOF
-
-saml:
-  session-duration: ${SAML_SESSION_DURATION:-604800}
-  cleanup-interval-seconds: ${SAML_CLEANUP_INTERVAL_SECONDS:-0}
-  certificate: |
-$(echo "${SAML_CERTIFICATE:-}" | sed 's/^/    /')
-  private-key: |
-$(echo "${SAML_PRIVATE_KEY:-}" | sed 's/^/    /')
-EOF
-
   echo "Configuration file generated at: $CONFIG_FILE"
 fi