diff --git a/pkg/bootstrap/platform/k8s.go b/pkg/bootstrap/platform/k8s.go
index fa1ff5b3..4aa99f85 100644
--- a/pkg/bootstrap/platform/k8s.go
+++ b/pkg/bootstrap/platform/k8s.go
@@ -38,14 +38,6 @@ data:
 ---
 apiVersion: v1
 kind: Secret
-metadata:
-  name: cl-peer
-  namespace: {{.namespace}}
-data:
-  ca: {{.peerCA}}
----
-apiVersion: v1
-kind: Secret
 metadata:
   name: cl-controlplane
   namespace: {{.namespace}}
@@ -65,6 +57,14 @@ data:
 ---
 apiVersion: v1
 kind: Secret
+metadata:
+  name: cl-peer
+  namespace: {{.namespace}}
+data:
+  ca: {{.peerCA}}
+---
+apiVersion: v1
+kind: Secret
 metadata:
   name: gwctl
   namespace: {{.namespace}}
@@ -112,9 +112,11 @@ spec:
         - name: tls
           secret:
             secretName: cl-controlplane
+{{ if not .crdMode }}
         - name: cl-controlplane
           persistentVolumeClaim:
             claimName: cl-controlplane
+{{ end }}
       containers:
         - name: cl-controlplane
           image: {{.containerRegistry}}cl-controlplane