diff --git a/helm-charts/karpenter-resources/templates/node-class.yaml b/helm-charts/karpenter-resources/templates/node-class.yaml
index eedcd77..ebc0dd5 100644
--- a/helm-charts/karpenter-resources/templates/node-class.yaml
+++ b/helm-charts/karpenter-resources/templates/node-class.yaml
@@ -41,13 +41,11 @@ spec:
     httpProtocolIPv6: {{ .Values.ec2NodeClass.metadataOptions.httpProtocolIPv6 }}
     httpPutResponseHopLimit: {{ .Values.ec2NodeClass.metadataOptions.httpPutResponseHopLimit }}
     httpTokens: {{ .Values.ec2NodeClass.metadataOptions.httpTokens }}
+  {{- with .Values.ec2NodeClass.blockDeviceMappings }}
   blockDeviceMappings:
-    - deviceName: {{ default "/dev/xvda" .Values.ec2NodeClass.blockDevice.deviceName }}
-      ebs:
-        volumeSize: {{ .Values.ec2NodeClass.blockDevice.volumeSize }}
-        volumeType: {{ .Values.ec2NodeClass.blockDevice.volumeType }}
-        encrypted: {{ .Values.ec2NodeClass.blockDevice.encrypted }}
-        deleteOnTermination: {{ .Values.ec2NodeClass.blockDevice.deleteOnTermination }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+
   detailedMonitoring: {{ .Values.ec2NodeClass.detailedMonitoring }}
   {{- if .Values.ec2NodeClass.instanceStorePolicy }}
   instanceStorePolicy: {{ .Values.ec2NodeClass.instanceStorePolicy }}
diff --git a/helm-charts/karpenter-resources/values.yaml b/helm-charts/karpenter-resources/values.yaml
index 32e39eb..b9c7c79 100644
--- a/helm-charts/karpenter-resources/values.yaml
+++ b/helm-charts/karpenter-resources/values.yaml
@@ -16,16 +16,16 @@ ec2NodeClass:
     httpProtocolIPv6: disabled
     httpPutResponseHopLimit: 2
     httpTokens: required
-  blockDevice:
-    deviceName: /dev/xvda
-    volumeSize: 100Gi
-    volumeType: gp3
-    encrypted: true
-    deleteOnTermination: true
+  blockDeviceMappings:
+    - deviceName: /dev/xvda
+      ebs:
+        volumeSize: 100Gi
+        volumeType: gp3
+        encrypted: true
+        deleteOnTermination: true
   detailedMonitoring: true
   userData:
   instanceStorePolicy:
-
 # NodePool specific values
 nodePool:
   enabled: true