diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9388953a..95679007d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Included cash in the performance calculation of the portfolio
+- Moved the support for tags in the account from experimental to general availability
 - Upgraded `countup.js` from version `2.10.0` to `2.10.1`
 - Upgraded `dotenv` from version `17.2.3` to `17.4.2`
 - Upgraded `dotenv-expand` from version `12.0.3` to `13.0.0`
diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
index c707a9402..d5743313d 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -85,15 +85,13 @@
         ></textarea>
       </mat-form-field>
     </div>
-    @if (data.user?.settings?.isExperimentalFeatures) {
-      <div class="mb-3">
-        <gf-tags-selector
-          formControlName="tags"
-          [hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"
-          [tagsAvailable]="tagsAvailable"
-        />
-      </div>
-    }
+    <div class="mb-3">
+      <gf-tags-selector
+        formControlName="tags"
+        [hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"
+        [tagsAvailable]="tagsAvailable"
+      />
+    </div>
     <div class="mb-3 px-2">
       <mat-checkbox color="primary" formControlName="isExcluded" i18n
         >Exclude from Analysis</mat-checkbox