diff --git a/kubernetes-csi-external-snapshotter-8.5.yaml b/kubernetes-csi-external-snapshotter-8.5.yaml
new file mode 100644
index 000000000000..cd6207a4d13c
--- /dev/null
+++ b/kubernetes-csi-external-snapshotter-8.5.yaml
@@ -0,0 +1,79 @@
+package:
+  name: kubernetes-csi-external-snapshotter-8.5
+  version: "8.5.0"
+  epoch: 0 # CVE-2025-61729
+  description: Sidecar container that watches Kubernetes Snapshot CRD objects and triggers CreateSnapshot/DeleteSnapshot against a CSI endpoint
+  copyright:
+    - license: Apache-2.0
+  dependencies:
+    provides:
+      - kubernetes-csi-external-snapshotter=${{package.full-version}}
+      - kubernetes-csi-external-csi-snapshotter=${{package.full-version}}
+      - kubernetes-csi-external-csi-snapshotter-${{vars.major-minor-version}}=${{package.full-version}}
+
+var-transforms:
+  - from: ${{package.version}}
+    match: ^(\d+\.\d+)\.\d+$
+    replace: "$1"
+    to: major-minor-version
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://github.com/kubernetes-csi/external-snapshotter
+      tag: v${{package.version}}
+      expected-commit: 5aab051d1af135e2c852f6fb7fc27fa709d877bf
+
+  - uses: go/build
+    with:
+      packages: ./cmd/csi-snapshotter
+      output: csi-snapshotter
+      ldflags: -X main.version=$(git describe --long --tags --match="v*" --dirty 2>/dev/null || git rev-list -n1 HEAD) -extldflags "-static"
+
+  - uses: strip
+
+subpackages:
+  - name: kubernetes-csi-external-snapshot-controller-${{vars.major-minor-version}}
+    dependencies:
+      provides:
+        - kubernetes-csi-external-snapshot-controller=${{package.full-version}}
+    pipeline:
+      - uses: go/build
+        with:
+          packages: ./cmd/snapshot-controller
+          output: snapshot-controller
+          ldflags: -X main.version=$(git describe --long --tags --match="v*" --dirty 2>/dev/null || git rev-list -n1 HEAD) -extldflags "-static"
+      - uses: strip
+    test:
+      pipeline:
+        - uses: test/virtualpackage
+          with:
+            virtual-pkg-name: kubernetes-csi-external-snapshot-controller
+            real-pkg-name: ${{subpkg.name}}
+
+update:
+  enabled: true
+  github:
+    identifier: kubernetes-csi/external-snapshotter
+    strip-prefix: v
+    tag-filter: v8.5
+
+test:
+  environment:
+    contents:
+      packages:
+        - kubernetes-csi-external-snapshot-controller-${{vars.major-minor-version}}
+        - curl
+        - kubernetes-csi-driver-hostpath
+  pipeline:
+    - runs: |
+        csi-snapshotter --help
+        snapshot-controller --help
+        csi-snapshotter --version
+    - uses: test/kwok/cluster
+    - runs: |
+        mkdir -p /csi
+        hostpathplugin --v=5 --endpoint="unix:///csi/csi.sock" --nodeid="node-000000" > /dev/null 2>&1 &
+        csi-snapshotter --v=5 --csi-address "/csi/csi.sock" --kubeconfig ~/.kube/config --http-endpoint ":8080" > /dev/null 2>&1 &
+        sleep 10
+        curl -Lk localhost:8080/metrics