diff --git a/infra/values/base/keycloak-values.yaml b/infra/values/base/keycloak-values.yaml
index c8a9307..f1a742c 100644
--- a/infra/values/base/keycloak-values.yaml
+++ b/infra/values/base/keycloak-values.yaml
@@ -677,16 +677,18 @@ extraDeploy:
                 CLIENTS=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
                   "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
 
-                CANDIDATES=$(echo "$CLIENTS" | jq -c --argjson protected "$PROTECTED_JSON" --argjson now "$NOW_SEC" --argjson min_age "$MIN_AGE_SEC" --arg pattern "$CLIENT_ID_PATTERN" '
+                CANDIDATES=$(echo "$CLIENTS" | jq -c --argjson protected "$PROTECTED_JSON" \
+                  --argjson now "$NOW_SEC" --argjson min_age "$MIN_AGE_SEC" --arg pattern "$CLIENT_ID_PATTERN" '
                   [
                     .[]
                     | select(.clientId as $cid | $protected | index($cid) | not)
                     | select(.attributes["k8s.secret.sync"] != "true")
                     | select(.clientId | test($pattern; "i"))
-                    | select((.createdTimestamp // 0) / 1000 < ($now - $min_age))
+                    | select(.attributes["client.secret.creation.time"] != null)
+                    | select((.attributes["client.secret.creation.time"] | tonumber) < ($now - $min_age))
                   ]
                 ')
-
+                
                 COUNT=$(echo "$CANDIDATES" | jq 'length')
                 echo "Found ${COUNT} candidate client(s) matching pattern and age threshold"