diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 09ead656a..db9e82a26 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,6 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # Web site
+      - name: Add some files
+        run: |
+          echo "akhq.io" > docs/CNAME
+          cp LICENSE docs/LICENSE
+          cp README.md docs/README.md
+          cp README.md docs/README
+          cp artifacthub-repo.yml docs/artifacthub-repo.yml
+
       # Helm charts
       - uses: J12934/helm-gh-pages-action@master
         with:
@@ -20,12 +29,6 @@ jobs:
           charts-folder: "helm"
           deploy-branch: helm
 
-      # Web site
-      - name: Contributor
-        run: |
-          npm i github-contributors-list
-          node_modules/.bin/githubcontrib --repo akhq --owner tchiotludo --format html --sortOrder desc > docs/contributors.html
-
       # Clone helm charts
       - name: Clone helm charts
         uses: actions/checkout@v2
@@ -33,12 +36,17 @@ jobs:
           ref: helm
           path: tmp-helm
 
-      # Web site
+      # Add helm charts
       - name: Add helm charts
         run: |
           rm -rf tmp-helm/.git
           cp -R tmp-helm/* docs/
-          echo "akhq.io" > docs/CNAME
+
+      # Contributors
+      - name: Contributor
+        run: |
+          npm i github-contributors-list
+          node_modules/.bin/githubcontrib --repo akhq --owner tchiotludo --format html --sortOrder desc > docs/contributors.html
 
       # Deploy
       - name: Deploy
diff --git a/README.md b/README.md
index 21e0f0dbc..73fdb1b63 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 ![Github Downloads](https://img.shields.io/github/downloads/tchiotludo/akhq/total)
 ![Github Start](https://img.shields.io/github/stars/tchiotludo/akhq.svg)
 ![Main](https://github.com/tchiotludo/akhq/workflows/Main/badge.svg)
+[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/akhq)](https://artifacthub.io/packages/search?repo=akhq)
 
 > Kafka GUI for [Apache Kafka](http://kafka.apache.org/) to manage topics, topics data, consumers group, schema registry, connect and more...
 
diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml
new file mode 100644
index 000000000..fc1d20b55
--- /dev/null
+++ b/artifacthub-repo.yml
@@ -0,0 +1 @@
+repositoryID: 4ff0915c-0d71-4f9b-9440-2038c81039f9
diff --git a/helm/akhq/Chart.yaml b/helm/akhq/Chart.yaml
index 84f92da1f..f4dca46e5 100644
--- a/helm/akhq/Chart.yaml
+++ b/helm/akhq/Chart.yaml
@@ -7,6 +7,8 @@ keywords:
   - kafka
   - confluent
   - gui
+  - schema-registry
+  - kafka-connect
 home: https://akhq.io
 icon: https://raw.githubusercontent.com/tchiotludo/akhq/master/assets/img/logo_black.png
 sources: