diff --git a/lib/init-action.js b/lib/init-action.js
index d4aa4d0a5..2354029a8 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -86270,7 +86270,10 @@ async function loadPropertiesFromApi(logger, repositoryNwo) {
         `Expected repository properties API to return an array, but got: ${JSON.stringify(response.data)}`
       );
     }
-    const knownProperties = new Set(Object.keys(RepositoryPropertyName));
+    logger.debug(
+      `Retrieved ${remoteProperties.length} repository properties: ${remoteProperties.map((p) => p.property_name).join(", ")}`
+    );
+    const knownProperties = new Set(Object.values(RepositoryPropertyName));
     const properties = {};
     for (const property of remoteProperties) {
       if (property.property_name === void 0) {
diff --git a/src/feature-flags/properties.ts b/src/feature-flags/properties.ts
index 4e9f25c20..a64400726 100644
--- a/src/feature-flags/properties.ts
+++ b/src/feature-flags/properties.ts
@@ -50,7 +50,11 @@ export async function loadPropertiesFromApi(
       );
     }
 
-    const knownProperties = new Set(Object.keys(RepositoryPropertyName));
+    logger.debug(
+      `Retrieved ${remoteProperties.length} repository properties: ${remoteProperties.map((p) => p.property_name).join(", ")}`,
+    );
+
+    const knownProperties = new Set(Object.values(RepositoryPropertyName));
     const properties: RepositoryProperties = {};
     for (const property of remoteProperties) {
       if (property.property_name === undefined) {
@@ -59,7 +63,9 @@ export async function loadPropertiesFromApi(
         );
       }
 
-      if (knownProperties.has(property.property_name)) {
+      if (
+        knownProperties.has(property.property_name as RepositoryPropertyName)
+      ) {
         properties[property.property_name] = property.value;
       }
     }