diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efb4650e..ca8c11c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   release:
-    if: "!startsWith(github.ref, 'refs/tags/eoapi-')"  # prevent the helm chart releaser from running this release workflow
+    if: ${{ !startsWith(github.ref, 'refs/tags/eoapi-') }}  # prevent the helm chart releaser from running this release workflow
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -42,3 +42,4 @@ jobs:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: true
           CR_INDEX_PATH: "."
+          
diff --git a/README.md b/README.md
index 9715b119..2141520d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,10 @@
       <img src="https://github.com/developmentseed/eoapi-k8s/actions/workflows/helm-tests.yml/badge.svg?branch=main" alt="Test">
   </a>
   <a href="https://github.com/developmentseed/eoapi-k8s/blob/main/LICENSE" target="_blank">
-      <img src="https://img.shields.io/github/license/developmentseed/titiler.svg" alt="Downloads">
+      <img src="https://img.shields.io/github/license/developmentseed/titiler.svg" alt="License">
+  </a>
+  <a href="https://artifacthub.io/packages/search?repo=eoapi" target="_blank">
+      <img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/eoapi" alt="Artifact Hub">
   </a>
 </p>
 
diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml
deleted file mode 100644
index fd5e76e5..00000000
--- a/artifacthub-repo.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Artifact Hub repository metadata file
-#
-# Some settings like the verified publisher flag or the ignored packages won't
-# be applied until the next time the repository is processed. Please keep in
-# mind that the repository won't be processed if it has not changed since the
-# last time it was processed. Depending on the repository kind, this is checked
-# in a different way. For Helm http based repositories, we consider it has
-# changed if the `index.yaml` file changes. For git based repositories, it does
-# when the hash of the last commit in the branch you set up changes. This does
-# NOT apply to ownership claim operations, which are processed immediately.
-#
-repositoryID: bb8121e4-7762-43a1-971a-ea0454ba6027
-owners: # (optional, used to claim repository ownership)
-  - name: ranchodeluxe
-    email: greg@developmentseed.org
diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml
index 3546c307..bf544c42 100644
--- a/helm-chart/eoapi/Chart.yaml
+++ b/helm-chart/eoapi/Chart.yaml
@@ -12,6 +12,26 @@ description: Create a full Earth Observation API with Metadata, Raster and Vecto
 type: application
 kubeVersion: ">=1.23.0-0"
 
+# Artifacthub metadata
+annotations:
+  artifacthub.io/changes: |
+    - Adds integration with Artifacthub.io
+  artifacthub.io/links: |
+    - name: GitHub Repository
+      url: https://github.com/developmentseed/eoapi-k8s
+    - name: Documentation
+      url: https://github.com/developmentseed/eoapi-k8s/tree/main/docs
+  artifacthub.io/maintainers: |
+    - name: DevelopmentSeed
+      email: eoapi@developmentseed.org
+  artifacthub.io/keywords: |
+    - earth observation
+    - geospatial
+    - kubernetes
+    - stac
+    - raster
+    - vector
+
 # 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/)
diff --git a/helm-chart/postgrescluster/Chart.yaml b/helm-chart/postgrescluster/Chart.yaml
index 6d74f65f..c3b7effc 100644
--- a/helm-chart/postgrescluster/Chart.yaml
+++ b/helm-chart/postgrescluster/Chart.yaml
@@ -7,4 +7,23 @@ type: application
 # https://access.crunchydata.com/documentation/postgres-operator/latest/releases
 version: 5.7.4
 appVersion: 5.7.4
-force: true
+# Removed invalid 'force' property
+
+# Artifacthub metadata
+annotations:
+  artifacthub.io/changes: |
+    - Adds integration with Artifacthub.io
+  artifacthub.io/links: |
+    - name: GitHub Repository
+      url: https://github.com/developmentseed/eoapi-k8s
+    - name: Documentation
+      url: https://github.com/developmentseed/eoapi-k8s/tree/main/docs
+  artifacthub.io/maintainers: |
+    - name: DevelopmentSeed
+      email: eoapi@developmentseed.org
+  artifacthub.io/keywords: |
+    - postgres
+    - database
+    - postgis
+    - pgstac
+    - kubernetes