diff --git a/base/calico-typha-tolerations.yaml b/base/calico-typha-tolerations.yaml
new file mode 100644
index 0000000..fa77d2a
--- /dev/null
+++ b/base/calico-typha-tolerations.yaml
@@ -0,0 +1,18 @@
+# Patch calico-typha Deployment to allow scheduling on all nodes until:
+# https://github.com/projectcalico/calico/pull/7979 is merged/released.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: calico-typha
+spec:
+  template:
+    spec:
+      tolerations:
+        # Mark the pod as a critical add-on for rescheduling.
+        - key: CriticalAddonsOnly
+          operator: Exists
+        # Make sure Typha can get scheduled on any nodes.
+        - effect: NoSchedule
+          operator: Exists
+        - effect: NoExecute
+          operator: Exists
diff --git a/base/kustomization.yaml b/base/kustomization.yaml
index 3b30531..e641e39 100644
--- a/base/kustomization.yaml
+++ b/base/kustomization.yaml
@@ -6,9 +6,10 @@ resources:
   - apiserver.yaml
   - calico-typha.yaml
   - felix-metrics-svc.yaml
-patchesStrategicMerge:
-  - apiserver-args.yaml
-  - apiserver-rolling-strategy.yaml
-  - calico-env-patch.yaml
-  - calico-init-patch.yaml
-  - calico-resources-patch.yaml
+patches:
+  - path: apiserver-args.yaml
+  - path: apiserver-rolling-strategy.yaml
+  - path: calico-env-patch.yaml
+  - path: calico-init-patch.yaml
+  - path: calico-resources-patch.yaml
+  - path: calico-typha-tolerations.yaml