diff --git a/.github/workflows/artifacthub.yaml b/.github/workflows/artifacthub.yaml
new file mode 100644
index 00000000..f1501626
--- /dev/null
+++ b/.github/workflows/artifacthub.yaml
@@ -0,0 +1,29 @@
+name: artifacthub
+
+on:
+  push:
+    branches: ["main"]
+    paths: ["charts/spegel/artifacthub-repo.yml"]
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v4
+        with:        
+          submodules: true
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup ORAS
+        uses: oras-project/setup-oras@v1
+      - name: Push Artifact Hub metadata
+        run: oras push ghcr.io/spegel-org/helm-charts/spegel:artifacthub.io --config /dev/null:application/vnd.cncf.artifacthub.config.v1+yaml charts/spegel/artifacthub-repo.yml:application/vnd.cncf.artifacthub.repository-metadata.layer.v1.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 14173068..e3d79563 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -65,6 +65,7 @@ jobs:
       - name: Publish Helm chart to GHCR
         id: helm
         run: |
+          rm charts/spegel/artifacthub-repo.yml
           yq -i '.image.digest = "${{ steps.build.outputs.DIGEST }}"' charts/spegel/values.yaml
           helm package --app-version ${{ steps.prep.outputs.VERSION }} --version ${{ steps.prep.outputs.VERSION }} charts/spegel
           helm push spegel-${{ steps.prep.outputs.VERSION }}.tgz oci://ghcr.io/spegel-org/helm-charts 2> .digest
diff --git a/charts/spegel/artifacthub-repo.yml b/charts/spegel/artifacthub-repo.yml
new file mode 100644
index 00000000..18bdbda3
--- /dev/null
+++ b/charts/spegel/artifacthub-repo.yml
@@ -0,0 +1,4 @@
+repositoryID: 8122016b-c465-4eaf-be87-f51423aa76f1
+owners:
+  - name: Philip Laine
+    email: philip.laine@gmail.com