diff --git a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotclasses.yml.j2 b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotclasses.yml.j2
index 09b1e5fdc..1b0853d98 100644
--- a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotclasses.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotclasses.yml.j2
@@ -62,7 +62,7 @@ spec:
     storage: false
 {% else %}
     storage: true
-{% end %}
+{% endif %}
     subresources: {}
   - additionalPrinterColumns:
     - jsonPath: .driver
@@ -82,7 +82,7 @@ spec:
     deprecated: true
     # This overrides the default warning returned to clients making v1beta1 API requests.
     deprecationWarning: "snapshot.storage.k8s.io/v1beta1 VolumeSnapshotClass is deprecated; use snapshot.storage.k8s.io/v1 VolumeSnapshotClass"
-{% end %}
+{% endif %}
     schema:
       openAPIV3Schema:
         description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced
@@ -116,7 +116,7 @@ spec:
     storage: true
 {% else %}
     storage: false
-{% end %}
+{% endif %}
     subresources: {}
 status:
   acceptedNames:
diff --git a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotcontents.yml.j2 b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotcontents.yml.j2
index 86411a7e7..c1cd7ff4a 100644
--- a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotcontents.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshotcontents.yml.j2
@@ -47,7 +47,7 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.namespace
       name: VolumeSnapshotNamespace
       type: string
-{% end %}
+{% endif %}
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -159,7 +159,7 @@ spec:
     storage: false
 {% else %}
     storage: true
-{% end %}
+{% endif %}
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -192,7 +192,7 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.namespace
       name: VolumeSnapshotNamespace
       type: string
-{% end %}
+{% endif %}
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -306,7 +306,7 @@ spec:
     storage: true
 {% else %}
     storage: false
-{% end %}
+{% endif %}
     subresources:
       status: {}
 status:
diff --git a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshots.yml.j2 b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshots.yml.j2
index c53741604..33fa9f7da 100644
--- a/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshots.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/csi_crd/templates/volumesnapshots.yml.j2
@@ -120,7 +120,7 @@ spec:
     storage: false
 {% else %}
     storage: true
-{% end %}
+{% endif %}
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -162,7 +162,7 @@ spec:
     deprecated: true
     # This overrides the default warning returned to clients making v1beta1 API requests.
     deprecationWarning: "snapshot.storage.k8s.io/v1beta1 VolumeSnapshot is deprecated; use snapshot.storage.k8s.io/v1 VolumeSnapshot"
-{% end %}
+{% endif %}
     schema:
       openAPIV3Schema:
         description: VolumeSnapshot is a user's request for either creating a point-in-time snapshot of a persistent volume, or binding to a pre-existing snapshot.
@@ -230,7 +230,7 @@ spec:
     storage: true
 {% else %}
     storage: false
-{% end %}
+{% endif %}
     subresources:
       status: {}
 status: