diff --git a/config/webhook/0-namespace.yaml b/config/webhook/0-namespace.yaml
new file mode 100644
index 0000000000..3dbea03a71
--- /dev/null
+++ b/config/webhook/0-namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: gateway-system
diff --git a/config/webhook/admission_webhook.yaml b/config/webhook/admission_webhook.yaml
index 408cb3be27..1e669de4c2 100644
--- a/config/webhook/admission_webhook.yaml
+++ b/config/webhook/admission_webhook.yaml
@@ -1,8 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: gateway-system
----
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
diff --git a/config/webhook/certificate_config.yaml b/config/webhook/certificate_config.yaml
index f1b20847ef..bb78e991c5 100644
--- a/config/webhook/certificate_config.yaml
+++ b/config/webhook/certificate_config.yaml
@@ -1,9 +1,4 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: gateway-system
----
-apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: gateway-api-admission