diff --git a/infrastructure/coredns/poddisruptionbudget.yaml b/infrastructure/coredns/poddisruptionbudget.yaml
deleted file mode 100644
index ee1521c935755730c4982f658de6cade6e5ed242..0000000000000000000000000000000000000000
--- a/infrastructure/coredns/poddisruptionbudget.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: coredns
-  namespace: kube-system
-spec:
-  minAvailable: 1
-  selector:
-    matchLabels:
-      k8s-app: kube-dns
diff --git a/infrastructure/coredns/kustomization.yaml b/infrastructure/kube-system/kustomization.yaml
similarity index 100%
rename from infrastructure/coredns/kustomization.yaml
rename to infrastructure/kube-system/kustomization.yaml
diff --git a/infrastructure/kube-system/poddisruptionbudget.yaml b/infrastructure/kube-system/poddisruptionbudget.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d394efaa2039eff048300b3d52b3ca35655da56b
--- /dev/null
+++ b/infrastructure/kube-system/poddisruptionbudget.yaml
@@ -0,0 +1,23 @@
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: coredns
+  namespace: kube-system
+spec:
+  minAvailable: 1
+  selector:
+    matchLabels:
+      k8s-app: kube-dns
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: etcd
+  namespace: kube-system
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      component: etcd
+      tier: control-plane
+