diff --git a/bootstrap/kube-system/snapshot-controller-crds.yaml b/bootstrap/kube-system/snapshot-controller-crds.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0f70a13a30a35a92d7b04a12405f2edb3bf900bf
--- /dev/null
+++ b/bootstrap/kube-system/snapshot-controller-crds.yaml
@@ -0,0 +1,31 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: external-snapshotter
+  namespace: kube-system
+spec:
+  interval: 24h
+  ref:
+    tag: v6.2.1
+  url: https://github.com/kubernetes-csi/external-snapshotter.git
+  ignore: |
+    # exclude all
+    /*
+    # Only pull the relevant manifests
+    !/deploy/kubernetes/snapshot-controller
+    !/client/config/crd
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: external-snapshotter-crd
+  namespace: kube-system
+spec:
+  interval: 10m0s
+  path: ./client/config/crd
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: external-snapshotter
+    namespace: kube-system
\ No newline at end of file
diff --git a/bootstrap/kustomization.yaml b/bootstrap/kustomization.yaml
deleted file mode 100644
index 0e7ca24a2e81566d58907f9011ed24bf959a6b24..0000000000000000000000000000000000000000
--- a/bootstrap/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - calico
-  - system-upgrades
diff --git a/infrastructure/kube-system/kustomization.yaml b/infrastructure/kube-system/kustomization.yaml
index bc66966b36c23c78d4843a4dc855126dbe63b771..6032f0c6f12cd90cad9967e5c7410f105a1062f3 100644
--- a/infrastructure/kube-system/kustomization.yaml
+++ b/infrastructure/kube-system/kustomization.yaml
@@ -6,4 +6,5 @@ resources:
   - quorum.yaml
   - descheduler.yaml
   - metrics-server.yaml
+  - snapshot-controller.yaml
   - ../../shared/networkpolicies/allow-from-all-namespaces.yaml
diff --git a/infrastructure/kube-system/snapshot-controller.yaml b/infrastructure/kube-system/snapshot-controller.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dd74edf05e7abfaf3b800336757c386c2c74744c
--- /dev/null
+++ b/infrastructure/kube-system/snapshot-controller.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: external-snapshotter
+  namespace: kube-system
+spec:
+  interval: 10m0s
+  path: ./deploy/kubernetes/snapshot-controller
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: external-snapshotter
+    namespace: kube-system
+  dependsOn:
+    - name: external-snapshotter-crd