diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ff76b0c2..bca1a8de9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the _Self-Hosting_ section content for the _Compare with..._ concept on the Frequently Asked Questions (FAQ) page
+- Improved the _Self-Hosting_ section content for the _Markets_ concept on the Frequently Asked Questions (FAQ) page
 - Changed the build executor of the client from `@nx/angular:webpack-browser` to `@nx/angular:browser-esbuild`
 - Improved the language localization for German (`de`)
 
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
index b2c063684..3d855e6e0 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -352,7 +352,6 @@
               <div class="w-50">
                 <mat-checkbox
                   color="primary"
-                  i18n
                   [checked]="isBenchmark"
                   [disabled]="isEditAssetProfileIdentifierMode"
                   (change)="
@@ -366,8 +365,13 @@
                           symbol: data.symbol
                         })
                   "
-                  >Benchmark</mat-checkbox
                 >
+                  <ng-container i18n>Include in</ng-container>
+                  <ng-container>&nbsp;</ng-container>
+                  <ng-container i18n>Benchmark</ng-container>
+                  <ng-container> / </ng-container>
+                  <ng-container i18n>Markets</ng-container>
+                </mat-checkbox>
               </div>
             </div>
             <div class="mt-3">
diff --git a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html
index bc468fe96..f44759124 100644
--- a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html
+++ b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html
@@ -184,7 +184,9 @@
             <li>Open the <i>Admin Control</i> panel</li>
             <li>Navigate to the <i>Market Data</i> section</li>
             <li>Choose an asset profile</li>
-            <li>In the dialog, check the <i>Benchmark</i> box</li>
+            <li>
+              In the dialog, check the <i>Include in Benchmark / Markets</i> box
+            </li>
           </ol>
         </mat-card-content>
       </mat-card>
@@ -212,12 +214,13 @@
           <mat-card-title>How do I set up <i>Markets</i>?</mat-card-title>
         </mat-card-header>
         <mat-card-content>
-          <p>The <i>Markets</i> list is derived from your <i>Benchmarks</i>.</p>
           <ol>
             <li>Open the <i>Admin Control</i> panel</li>
             <li>Navigate to the <i>Market Data</i> section</li>
             <li>Choose an asset profile</li>
-            <li>In the dialog, check the <i>Benchmark</i> box</li>
+            <li>
+              In the dialog, check the <i>Include in Benchmark / Markets</i> box
+            </li>
           </ol>
           <p>
             Please note: Data is cached, meaning changes may take a few minutes