diff --git a/snippets/cloud-init.sh b/snippets/cloud-init/commands.sh
similarity index 100%
rename from snippets/cloud-init.sh
rename to snippets/cloud-init/commands.sh
diff --git a/snippets/cloud-init/ec2  prepare disks  cloud-init 24.2 onwards.yaml b/snippets/cloud-init/ec2  prepare disks  cloud-init 24.2 onwards.yaml
new file mode 100644
index 0000000..5d612cf
--- /dev/null
+++ b/snippets/cloud-init/ec2  prepare disks  cloud-init 24.2 onwards.yaml	
@@ -0,0 +1,22 @@
+---
+#cloud-config
+
+###
+# Sources:
+#   - https://cloudinit.readthedocs.io/en/latest/reference/modules.html#mounts
+#   - https://stackoverflow.com/questions/49980714/how-to-use-cloud-init-to-mount-an-unformatted-ebs-volume#78737805
+###
+
+device_aliases:
+  data: /dev/nvme1n1
+disk_setup:
+  data:
+    layout: true
+    overwrite: false
+    table_type: gpt
+fs_setup:
+  - device: "data.1"
+    filesystem: "xfs"
+    label: "data"
+mounts:
+  - [ "data.1", "/mnt/data" ]
diff --git a/snippets/cloud-init/ec2  prepare disks  cloud-init pre 24.2.yaml b/snippets/cloud-init/ec2  prepare disks  cloud-init pre 24.2.yaml
new file mode 100644
index 0000000..24d0719
--- /dev/null
+++ b/snippets/cloud-init/ec2  prepare disks  cloud-init pre 24.2.yaml	
@@ -0,0 +1,29 @@
+---
+#cloud-config
+
+###
+# Sources:
+#   - https://cloudinit.readthedocs.io/en/latest/reference/modules.html#mounts
+#   - https://stackoverflow.com/questions/49980714/how-to-use-cloud-init-to-mount-an-unformatted-ebs-volume#78737805
+###
+
+device_aliases:
+  data: /dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0a250869ccd411b30
+disk_setup:
+  data:
+    layout: true
+    overwrite: false
+    table_type: gpt
+fs_setup:
+  - device: "data.1"
+    filesystem: "xfs"
+    label: "data"
+mounts:
+  - [
+      "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0a250869ccd411b30-part1",
+      "/mnt/data",
+      "xfs",
+      "defaults,nofail,x-systemd.device-timeout=30s,x-systemd.makefs",
+      "0",
+      "2"
+    ]