diff --git a/libs/angular/src/tools/achievements/achievements-list.component.html b/libs/angular/src/tools/achievements/achievements-list.component.html
index 34253cb1bbc..1715e8d4836 100644
--- a/libs/angular/src/tools/achievements/achievements-list.component.html
+++ b/libs/angular/src/tools/achievements/achievements-list.component.html
@@ -1,4 +1,4 @@
-<bit-section *ngIf="achievements.size > 0">
+<bit-section *ngIf="achievements.length > 0">
   <bit-section-header>
     <h2 class="tw-font-bold" bitTypography="h6">
       {{ "achievements" | i18n }}
diff --git a/libs/angular/src/tools/achievements/achievements-list.component.ts b/libs/angular/src/tools/achievements/achievements-list.component.ts
index 0bec15b2ad3..becfe59a477 100644
--- a/libs/angular/src/tools/achievements/achievements-list.component.ts
+++ b/libs/angular/src/tools/achievements/achievements-list.component.ts
@@ -44,7 +44,7 @@ import { iconMap } from "./icons/icon-map";
   ],
 })
 export class AchievementsListComponent {
-  protected achievements: Map<AchievementId, Achievement>;
+  protected achievements: Array<Achievement>;
   private _earned: Map<AchievementId, AchievementEarnedEvent> = new Map();
   private _progress: Map<MetricId, AchievementProgressEvent> = new Map();
 
@@ -53,7 +53,7 @@ export class AchievementsListComponent {
     private accountService: AccountService,
     zone: NgZone,
   ) {
-    this.achievements = achievementService.achievementMap();
+    this.achievements = Array.from(achievementService.achievementMap().values());
 
     this.accountService.activeAccount$
       .pipe(
diff --git a/libs/common/src/tools/achievements/achievement-events.ts b/libs/common/src/tools/achievements/achievement-events.ts
index f5665faf3eb..20ab5b08745 100644
--- a/libs/common/src/tools/achievements/achievement-events.ts
+++ b/libs/common/src/tools/achievements/achievement-events.ts
@@ -17,7 +17,6 @@ export function progressEvent(name: MetricId, value: number = 1): AchievementPro
       node: {
         name: "an-installation-identifier-for-this-client-instance",
       },
-      environment: "local",
       version: "2025.3.1-innovation-sprint",
     },
     user: {
@@ -41,7 +40,6 @@ export function earnedEvent(name: AchievementId): AchievementEarnedEvent {
       node: {
         name: "an-installation-identifier-for-this-client-instance",
       },
-      environment: "local",
       version: "2025.3.1-innovation-sprint",
     },
     user: {