diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33baa68c4..44b641f7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the content of the _Self-Hosting_ section by available home server systems on the Frequently Asked Questions (FAQ) page
+
 ### Fixed
 
 - Fixed an issue in the performance calculation caused by multiple `SELL` activities on the same day
diff --git a/README.md b/README.md
index c82ad50c3..eb302936e 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ docker compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 
 ### Home Server Systems (Community)
 
-Ghostfolio is available for various home server systems, including [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).
+Ghostfolio is available for various home server systems, including [CasaOS](https://github.com/bigbeartechworld/big-bear-casaos), [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).
 
 ## Development
 
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 5dcaa0cf7..1f95abef3 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
@@ -18,6 +18,25 @@
           <a href="https://github.com/ghostfolio/ghostfolio">GitHub</a>.
         </mat-card-content>
       </mat-card>
+      <mat-card appearance="outlined" class="mb-3">
+        <mat-card-header>
+          <mat-card-title
+            >Which home server systems is Ghostfolio available
+            on?</mat-card-title
+          >
+        </mat-card-header>
+        <mat-card-content>
+          The community has made Ghostfolio available on various home server
+          systems, including
+          <a href="https://github.com/bigbeartechworld/big-bear-casaos"
+            >CasaOS</a
+          >, <a href="https://www.runtipi.io/docs/apps-available">Runtipi</a>,
+          <a href="https://truecharts.org/charts/stable/ghostfolio"
+            >TrueCharts</a
+          >, <a href="https://apps.umbrel.com/app/ghostfolio">Umbrel</a>, and
+          <a href="https://unraid.net/community/apps?q=ghostfolio">Unraid</a>.
+        </mat-card-content>
+      </mat-card>
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-header>
           <mat-card-title>How do I add a new currency?</mat-card-title>
diff --git a/apps/client/src/app/pages/resources/resources-page.component.ts b/apps/client/src/app/pages/resources/resources-page.component.ts
index 5c9e690b9..23c5bf5eb 100644
--- a/apps/client/src/app/pages/resources/resources-page.component.ts
+++ b/apps/client/src/app/pages/resources/resources-page.component.ts
@@ -14,6 +14,7 @@ import { Subject } from 'rxjs';
 export class ResourcesPageComponent implements OnInit {
   public hasPermissionForSubscription: boolean;
   public info: InfoItem;
+  public routerLinkFaq = ['/' + $localize`faq`];
   public routerLinkResourcesPersonalFinanceTools = [
     '/' + $localize`resources`,
     'personal-finance-tools'
diff --git a/apps/client/src/app/pages/resources/resources-page.html b/apps/client/src/app/pages/resources/resources-page.html
index da57cc908..800c674cf 100644
--- a/apps/client/src/app/pages/resources/resources-page.html
+++ b/apps/client/src/app/pages/resources/resources-page.html
@@ -2,6 +2,23 @@
   <div class="row">
     <div class="col">
       <h1 class="d-none d-sm-block h3 mb-4 text-center" i18n>Resources</h1>
+      <h2 class="h4 mb-3" i18n>Ghostfolio</h2>
+      <div class="mb-5">
+        <div class="mb-4 media">
+          <div class="media-body">
+            <h3 class="h5 mt-0">Frequently Asked Questions (FAQ)</h3>
+            <div class="mb-1">
+              Find quick answers to commonly asked questions about Ghostfolio in
+              our Frequently Asked Questions (FAQ) section.
+            </div>
+            <div>
+              <a [routerLink]="routerLinkFaq"
+                >Frequently Asked Questions (FAQ) →</a
+              >
+            </div>
+          </div>
+        </div>
+      </div>
       <h2 class="h4 mb-3" i18n>Guides</h2>
       <div class="mb-5">
         <div class="mb-4 media">