diff --git a/.github/lint-config.yaml b/.github/lint-config.yaml
new file mode 100644
index 00000000..301e6eaa
--- /dev/null
+++ b/.github/lint-config.yaml
@@ -0,0 +1,10 @@
+---
+
+extends: default
+
+
+rules:
+  line-length: disable
+  trailing-spaces: disable
+  document-start: disable
+
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..0b3a297d
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,26 @@
+name: 'Lint collection-index.yml'
+on:
+  pull_request:
+    paths:
+      - _data/collection-index.yml
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  yamllint:
+    name: 'Yamllint'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v6
+      - name: 'Yamllint'
+        uses: karancode/yamllint-github-action@@v2.1.1
+        with:
+          yamllint_file_or_dir: _data/collection-index.yml
+          yamllint_strict: true
+          yamllint_config_filepath: .github/lint-config.yaml
+          yamllint_comment: true
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/_data/collection-index.yml b/_data/collection-index.yml
index d430f2c3..ff19f5e9 100644
--- a/_data/collection-index.yml
+++ b/_data/collection-index.yml
@@ -977,7 +977,6 @@
   contact: https://github.com/zetta/devcontainer-features/issues
   repository: https://github.com/zetta/devcontainer-features
   ociReference: ghcr.io/zetta/devcontainer-features
-  ociReference: ghcr.io/davzucky/devcontainers-features-wolfi  
 - name: devcontainer features for ubuntugis
   maintainer: Conner Shoop
   contact: https://github.com/connershoop/devcontainer-feature-ubuntugis/issues
@@ -988,7 +987,6 @@
   contact: https://github.com/The-Nefarious-Developer/devcontainer-templates/issues
   repository: https://github.com/The-Nefarious-Developer/devcontainer-templates
   ociReference: ghcr.io/the-nefarious-developer/devcontainer-templates
-  ociReference: ghcr.io/davzucky/devcontainers-features-wolfi
 - name: Dev Container Features by ForWarD Software
   maintainer: ForWarD Software
   contact: https://github.com/forwardsoftware/devcontainer-features/issues