diff --git a/src/repo.ts b/src/repo.ts
index 7109ce3e1..1245be220 100755
--- a/src/repo.ts
+++ b/src/repo.ts
@@ -494,6 +494,7 @@ export async function loadFileToSpec(
           return
         }
       }
+      // TODO: Remove workaround for User currently relying on id in console
       if (fileMap.kind === 'AplUser') {
         data.spec.id = data.metadata?.name
       }
@@ -507,6 +508,10 @@ export async function loadFileToSpec(
       }
     } else {
       const ref: Record<string, any> = get(spec, jsonPath)
+      // TODO: Remove workaround for Team settings currently relying on id in console
+      if (fileMap.kind === 'AplTeamSettingSet') {
+        data.spec.name = data.metadata?.name
+      }
       // Decrypted secrets may need to be merged with plain text specs
       const newRef = merge(cloneDeep(ref), data?.spec)
       set(spec, jsonPath, newRef)