diff --git a/examples/cloud-init/aws.ssm.yaml b/cloud-init/aws-ssm-agent.yaml
similarity index 91%
rename from examples/cloud-init/aws.ssm.yaml
rename to cloud-init/aws-ssm-agent.yaml
index 66c7163..5e9d7b5 100644
--- a/examples/cloud-init/aws.ssm.yaml
+++ b/cloud-init/aws-ssm-agent.yaml
@@ -1,11 +1,12 @@
 #cloud-config
 
+##
 # Install and enable the SSM agent on supported instances.
-
+#
 # Tested on:
 # - Amazon Linux 2023.4.20240416
+##
 
-package_upgrade: false
 packages:
   - amazon-ssm-agent
 
diff --git a/cloud-init/yum.automate-security-updates.yaml b/cloud-init/daily-security-updates.dnf.yaml
similarity index 84%
rename from cloud-init/yum.automate-security-updates.yaml
rename to cloud-init/daily-security-updates.dnf.yaml
index 93c49e6..d6e7695 100644
--- a/cloud-init/yum.automate-security-updates.yaml
+++ b/cloud-init/daily-security-updates.dnf.yaml
@@ -1,5 +1,10 @@
 #cloud-config
 
+##
+# Tested on:
+# - RHEL 8.6
+##
+
 write_files:
   - path: /etc/cron.daily/security-updates
     permissions: '0755'
diff --git a/cloud-init/yum.docker.yaml.tftpl b/cloud-init/docker.dnf-yum.yaml.tftpl
similarity index 82%
rename from cloud-init/yum.docker.yaml.tftpl
rename to cloud-init/docker.dnf-yum.yaml.tftpl
index 5317911..1de1a19 100644
--- a/cloud-init/yum.docker.yaml.tftpl
+++ b/cloud-init/docker.dnf-yum.yaml.tftpl
@@ -1,5 +1,10 @@
 #cloud-config
 
+##
+# Tested on:
+# - RHEL 8.6
+##
+
 yum_repos:
   docker-ce-stable:
     name: Docker CE Stable - $basearch
@@ -10,7 +15,7 @@ yum_repos:
     gpgkey: https://download.docker.com/linux/centos/gpg
 
 packages:
-  - docker-ce
+  - docker-ce  # brings in 'docker-ce-cli' and 'containerd.io' too
   - docker-compose-plugin
 
 runcmd: