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 61fd55ae..948c26c1 100644
--- a/_data/collection-index.yml
+++ b/_data/collection-index.yml
@@ -383,11 +383,6 @@
   contact: https://github.com/CodeMan99/features/issues
   repository: https://github.com/CodeMan99/features
   ociReference: ghcr.io/codeman99/features
-- name: Features by Favalos
-  maintainer: Fernando Avalos
-  contact: https://github.com/favalos/devcontainer-features/issues
-  repository: https://github.com/favalos/devcontainer-features
-  ociReference: ghcr.io/favalos/devcontainer-features
 - name: Community Templates
   maintainer: devcontainers-community
   contact: https://github.com/orgs/devcontainers-community/discussions
@@ -778,6 +773,11 @@
   contact: https://github.com/rafaph/devcontainer-features/issues
   repository: https://github.com/rafaph/devcontainer-features
   ociReference: ghcr.io/rafaph/devcontainer-features
+- name: Dev Container Features by weslyg
+  maintainer: weslyg
+  contact: https://github.com/weslyg/features/issues
+  repository:  https://github.com/weslyg/features
+  ociReference: ghcr.io/weslyg/features
 - name: SPFx Dev Container
   maintainer: Troy
   contact: https://github.com/tpalacino/SPFx-dev-container/issues
@@ -918,6 +918,11 @@
   contact: https://github.com/lx-0/devcontainer-templates/issues
   repository: https://github.com/lx-0/devcontainer-templates
   ociReference: ghcr.io/lx-0/devcontainer-templates
+- name: AIT-Assistive-Autonomous-Systems Dev Container Features
+  maintainer: AIT-Assistive-Autonomous-Systems maintainers
+  contact: https://github.com/AIT-Assistive-Autonomous-Systems/devcontainer_features/issues
+  repository: https://github.com/AIT-Assistive-Autonomous-Systems/devcontainer_features
+  ociReference: ghcr.io/ait-assistive-autonomous-systems/devcontainer_features
 - name: Hauke's Features for Development Containers
   maintainer: Hauke D
   contact: https://github.com/haukex/devcontainer-features/issues
@@ -961,7 +966,30 @@
   maintainer: David Zucker
   contact: https://github.com/davzucky/devcontainers-features-wolfi/issues
   repository: https://github.com/davzucky/devcontainers-features-wolfi
-  ociReference: ghcr.io/davzucky/devcontainers-features-wolfi
+  maintainer: eBizBase
+  contact: https://github.com/ebizbase/dev-infras/issues
+  repository: https://github.com/ebizbase/dev-infras
+  ociReference: ghcr.io/ebizbase/devcontainers-features
+- name: slang programming language
+  maintainer: loag
+  contact: https://github.com/Loag/slang-feature/issues
+  repository: https://github.com/Loag/slang-feature
+  ociReference: ghcr.io/loag/slang-feature
+- name: devcontainer features by zetta
+  maintainer: zetta
+  contact: https://github.com/zetta/devcontainer-features/issues
+  repository: https://github.com/zetta/devcontainer-features
+  ociReference: ghcr.io/zetta/devcontainer-features
+- name: devcontainer features for ubuntugis
+  maintainer: Conner Shoop
+  contact: https://github.com/connershoop/devcontainer-feature-ubuntugis/issues
+  repository: https://github.com/connershoop/devcontainer-feature-ubuntugis
+  ociReference: ghcr.io/connershoop/devcontainer-feature-ubuntugis
+- name: Nefarious Development Containers
+  maintainer: NickChecan
+  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
 - name: Dev Container Features by ForWarD Software
   maintainer: ForWarD Software
   contact: https://github.com/forwardsoftware/devcontainer-features/issues
@@ -1007,6 +1035,26 @@
   contact: https://github.com/RouL/devcontainer-features/issues
   repository: https://github.com/RouL/devcontainer-features
   ociReference: ghcr.io/roul/devcontainer-features
+- name: devcontainer features by itsalljustdata
+  maintainer: Jonathan Mills
+  contact: https://github.com/itsalljustdata/devcontainers-custom-features/issues
+  repository: https://github.com/itsalljustdata/devcontainers-custom-features
+  ociReference: ghcr.io/itsalljustdata/devcontainers-custom-features
+- name: Devcontainer for Cargo lambda
+  maintainer: Han Sen
+  contact: https://github.com/tokidoki11/devcontainer-feature/issues
+  repository: https://github.com/tokidoki11/devcontainer-feature
+  ociReference: ghcr.io/tokidoki11/devcontainer-feature/cargo-lambda
+- name: devcontainer features by irfansofyana
+  maintainer: irfansofyana
+  contact: https://github.com/irfansofyana/devcontainer-features/issues
+  repository: https://github.com/irfansofyana/devcontainer-features
+  ociReference: ghcr.io/irfansofyana/devcontainer-features
+- name: devcontainer templates by irfansofyana
+  maintainer: irfansofyana
+  repository: https://github.com/irfansofyana/devcontainer-templates
+  contact: https://github.com/irfansofyana/devcontainer-templates/issues
+  ociReference: ghcr.io/irfansofyana/devcontainer-templates
 - name: devcontainer templates by techiro
   maintainer: techiro
   contact: https://github.com/techiro/devcontainer-template/issues
@@ -1072,6 +1120,16 @@
   contact: https://github.com/jajera/features/issues
   repository: https://github.com/jajera/features
   ociReference: ghcr.io/jajera/features
+- name: Chromia Rell Development Container
+  maintainer: Chromaway AB
+  contact: https://github.com/chromiaproject/devcontainers-chromia/issues
+  repository: https://github.com/chromiaproject/devcontainers-chromia
+  ociReference: ghcr.io/chromiaproject/devcontainers-chromia/simple-chromia
+- name: AWS Lambda Dev Container
+  maintainer: Yuji Masaoka
+  contact: https://github.com/ymasaoka/devcontainer-templates/issues
+  repository: https://github.com/ymasaoka/devcontainer-templates
+  ociReference: ghcr.io/ymasaoka/devcontainer-templates
 - name: MrSimonEmms Dev Container Features
   maintainer: MrSimonEmms
   contact: https://github.com/mrsimonemms/devcontainers/issues
@@ -1082,6 +1140,11 @@
   contact: https://github.com/ferdinandkeller/features/issues
   repository: https://github.com/ferdinandkeller/features
   ociReference: ghcr.io/ferdinandkeller/features/httpie
+- name: sebdanielsson's templates
+  maintainer: Sebastian Danielsson (@sebdanielsson)
+  contact: https://github.com/sebdanielsson/devcontainers/issues
+  repository: https://github.com/sebdanielsson/devcontainers
+  ocireference: ghcr.io/sebdanielsson/devcontainers
 - name: Rojo Feature
   maintainer: Ryan Luu
   contact: https://github.com/RyanLua/features/issues
@@ -1092,6 +1155,16 @@
   contact: https://github.com/RyanLua/templates/issues
   repository: https://github.com/RyanLua/templates
   ociReference: ghcr.io/ryanlua/templates
+- name: Dev Container Features by Daniel Lindemann
+  maintainer: Daniel Lindemann
+  contact: https://github.com/daniellindemann/dev-container-features/issues
+  repository: https://github.com/daniellindemann/dev-container-features/tree/main/src/dotnet-usersecrets-persistence
+  ociReference: ghcr.io/daniellindemann/dev-container-features
+- name: Starship
+  maintainer: Tobias Chavarria
+  contact: https://github.com/tobiaschc/devcontainer-features/issues
+  repository: https://github.com/tobiaschc/devcontainer-features
+  ociReference: ghcr.io/tobiaschc/devcontainer-features
 - name: Dev Container Features by Joe Bowbeer
   maintainer: Joe Bowbeer
   contact: https://github.com/joebowbeer/devcontainers-features/issues
@@ -1102,7 +1175,26 @@
   contact: https://github.com/schnellerhase/devcontainer-fenics/issues
   repository: https://github.com/schnellerhase/devcontainer-fenics
   ociReference: ghcr.io/schnellerhase/devcontainer-fenics/fenics
-  ociReference: ghcr.io/ryanlua/templates/roblox
+- name: Dev Container Templates by pirpedro
+  maintainer: Pedro Rodrigues
+  contact: https://github.com/pirpedro/devcontainers/issues
+  repository: https://github.com/pirpedro/devcontainers
+  ociReference: ghcr.io/pirpedro/devcontainers
+- name: Dev Container Features by pirpedro
+  maintainer: Pedro Rodrigues
+  contact: https://github.com/pirpedro/features/issues
+  repository: https://github.com/pirpedro/features
+  ociReference: ghcr.io/pirpedro/features  
+- name: Dev container features for Azure linux images
+  maintainer: Victor Maznev
+  contact: https://github.com/bullmastiffo/devcontainers-features/issues
+  repository: https://github.com/bullmastiffo/devcontainers-features
+  ociReference: ghcr.io/bullmastiffo/devcontainers-features
+- name: Matt Mazzola Dev Containers
+  maintainer: mattmazzola
+  contact: https://github.com/mattmazzola/devcontainers/issues
+  repository: https://github.com/mattmazzola/devcontainers
+  ociReference: ghcr.io/mattmazzola/devcontainers
 - name: W&B Catnip
   maintainer: Weights and Biases
   contact: https://github.com/wandb/catnip/issues
@@ -1138,3 +1230,78 @@
   contact: https://github.com/navinkrishnan/devcontainer-templates-btp/issues
   repository: https://github.com/navinkrishnan/devcontainer-templates-btp
   ociReference: ghcr.io/navinkrishnan/devcontainer-templates-btp
+- name: Features by ksachdeva
+  maintainer: Kapil Sachdeva
+  contact: https://github.com/ksachdeva/devcontainer-features/issues
+  repository: https://github.com/ksachdeva/devcontainer-features
+  ociReference: ghcr.io/ksachdeva/devcontainer-features
+- name: Gemini CLI (via npm)
+  maintainer: siri404
+  contact: https://github.com/siri404/devcontainer-ai-features/issues
+  repository: https://github.com/siri404/devcontainer-ai-features
+  ociReference: ghcr.io/siri404/devcontainer-ai-features
+- name: EdgeActions Dev Container Templates
+  maintainer: Azure EdgeActions Developer Experiences Team
+  contact: https://github.com/Azure/edgeactions-devcontainers/issues
+  repository: https://github.com/Azure/edgeactions-devcontainers
+  ociReference: ghcr.io/Azure/edgeactions-devcontainers/edgeactions
+- name: Git Absorb Feature
+  maintainer: baxyz
+  contact: https://github.com/baxyz/devcontainer-features/issues
+  repository: https://github.com/baxyz/devcontainer-features/tree/main/src/git-absorb
+  ociReference: ghcr.io/baxyz/devcontainer-features/git-absorb
+- name: Shell History Per Project Feature
+  maintainer: baxyz
+  contact: https://github.com/baxyz/devcontainer-features/issues
+  repository: https://github.com/baxyz/devcontainer-features/tree/main/src/shell-history-per-project
+  ociReference: ghcr.io/baxyz/devcontainer-features/shell-history-per-project
+- name: Biome Feature
+  maintainer: baxyz
+  contact: https://github.com/baxyz/devcontainer-features/issues
+  repository: https://github.com/baxyz/devcontainer-features/tree/main/src/biome
+  ociReference: ghcr.io/baxyz/devcontainer-features/biome
+- name: Dev Container assets by Yassine Doghri
+  maintainer: Yassine Doghri
+  contact: https://github.com/yassinedoghri/devcontainers/issues
+  repository: https://github.com/yassinedoghri/devcontainers
+  ociReference: ghcr.io/yassinedoghri/devcontainers
+- name: Atomys Dev Container Features
+  maintainer: Atomys
+  contact: https://github.com/42atomys/devcontainers-features/issues
+  repository: https://github.com/42atomys/devcontainers-features
+  ociReference: ghcr.io/42atomys/devcontainers-features
+- name: PairSpaces
+  maintainer: PairSpaces by Interaction, LLC
+  contact: https://github.com/pairspaces/devcontainers/issues
+  repository: https://github.com/pairspaces/devcontainers
+  ociReference: ghcr.io/pairspaces/devcontainers/pairspaces
+- name: EstebenR Devcontainers
+  maintainer: EstebenR (Papabos)
+  contact: https://github.com/EstebenR/devcontainers/issues
+  repository: https://github.com/EstebenR/devcontainers/
+  ociReference: ghcr.io/estebenr/devcontainers
+- name: C++ Dev Container Template
+  maintainer: Philips Software
+  contact: https://github.com/philips-software/amp-devcontainer/issues
+  repository: https://github.com/philips-software/amp-devcontainer
+  ociReference: ghcr.io/philips-software/amp-devcontainer/cpp-template
+- name: Rust Dev Container Template
+  maintainer: Philips Software
+  contact: https://github.com/philips-software/amp-devcontainer/issues
+  repository: https://github.com/philips-software/amp-devcontainer
+  ociReference: ghcr.io/philips-software/amp-devcontainer/rust-template
+- name: Devcontainer Features for Devcontainer Configurations
+  maintainer: devcontainer-config
+  contact: https://github.com/devcontainer-config/features/issues
+  repository: https://github.com/devcontainer-config/features
+  ociReference: ghcr.io/devcontainer-config/features
+- name: Assorted Features
+  maintainer: Evit15
+  contact: https://github.com/Evit15/devcontainer-features/issues
+  repository: https://github.com/Evit15/devcontainer-features
+  ociReference: ghcr.io/Evit15/devcontainer-features
+- name: fexec
+  maintainer: roboslone
+  contact: https://github.com/roboslone/go-framework/issues
+  repository: https://github.com/roboslone/go-framework/tree/main/src/fexec
+  ociReference: ghcr.io/roboslone/go-framework