diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml
index 5b93840542ab40104fe3eb217458c09efbf4aec5..6d49805e91d9d85d67c1132b5ed8f6e8ccade0f1 100644
--- a/charts/mastodon/Chart.yaml
+++ b/charts/mastodon/Chart.yaml
@@ -1,25 +1,17 @@
 apiVersion: v2
 name: mastodon
 description: Mastodon is a free, open-source social network server based on ActivityPub.
+home: https://joinmastodon.org
+icon: https://avatars.githubusercontent.com/u/24979032?s=200&v=4
+keywords:
+    - mastodon
+    - activitypub
+sources:
+    - https://github.com/tootsuite/mastodon
+    - https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/charts/mastodon
 
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.5
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
+version: 3.0.6
 appVersion: v3.5.5
 
 dependencies:
diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md
index f2f194e710e21627cd61b43159cd7b0240ec6fdf..7fbdde45d803ff6f626e26a713e94524f20cb4ed 100644
--- a/charts/mastodon/README.md
+++ b/charts/mastodon/README.md
@@ -1,9 +1,16 @@
 # mastodon
 
-![Version: 3.0.5](https://img.shields.io/badge/Version-3.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.5](https://img.shields.io/badge/AppVersion-v3.5.5-informational?style=flat-square)
+![Version: 3.0.6](https://img.shields.io/badge/Version-3.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.5](https://img.shields.io/badge/AppVersion-v3.5.5-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 
+**Homepage:** <https://joinmastodon.org>
+
+## Source Code
+
+* <https://github.com/tootsuite/mastodon>
+* <https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/charts/mastodon>
+
 ## Requirements
 
 | Repository | Name | Version |