diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 1c1f23ef..4e9e840e 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -104,6 +104,18 @@ jobs:
       run: ct install --config ./default.ct.yaml  --helm-extra-args "--timeout 30m" --all
       if: ${{ contains(github.event.pull_request.labels.*.name, 'next-release') || contains(github.event.pull_request.labels.*.name, 'needs-testing') }}
 
+  linter-artifacthub:
+    runs-on: ubuntu-latest
+    container:
+      image: artifacthub/ah
+      options: --user root
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run ah lint
+        working-directory: ./charts/
+        run: ah lint
+
   artifacthub-changelog:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 428d9a9c..19d1ae92 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -30,3 +30,5 @@ jobs:
       uses: helm/chart-releaser-action@v1.6.0
       env:
         CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        # don't upload a chart if an existing tag exists
+        CR_SKIP_EXISTING: "true"
diff --git a/default.ct.yaml b/default.ct.yaml
index 87005ddb..1afe50d0 100644
--- a/default.ct.yaml
+++ b/default.ct.yaml
@@ -11,3 +11,4 @@ chart-repos:
 - kube-logging=https://kube-logging.github.io/helm-charts
 excluded-charts:
 - lagoon-test
+check-version-increment: false