diff --git a/vsphere.pkr.hcl b/vsphere.pkr.hcl
index ec56bd8..050b421 100644
--- a/vsphere.pkr.hcl
+++ b/vsphere.pkr.hcl
@@ -413,7 +413,7 @@ source "vsphere-iso" "baseimage" {
 
 locals {
   rhel_cloud_init = var.cloud_init_from_source ? "${path.root}/scripts/common/cloudinit_from_source.sh" : "${path.root}/scripts/el/install_cloud_tools.sh"
-  rhel_cloud_init_final = var.cloud_init_from_source ? "${path.root}/scripts/el/cloudinit_from_source_final.sh" : null
+  rhel_cloud_init_final = var.cloud_init_from_source ? "${path.root}/scripts/el/cloudinit_from_source_final.sh" : ""
   distro_build_scripts = {
     "Ubuntu" = [
       "${path.root}/scripts/ubuntu/install_open_vm_tools.sh",
@@ -433,14 +433,14 @@ locals {
       "${path.root}/scripts/el/cleanup_yum.sh",
       "${path.root}/scripts/el/rhn_remove_subscription.sh"
     ],
-    "RHEL" = [
+    "RHEL" = compact([
       "${path.root}/scripts/el/rhn_add_subscription.sh",
       "${path.root}/scripts/el/install_open_vm_tools.sh",
       local.rhel_cloud_init,
       local.rhel_cloud_init_final,
       "${path.root}/scripts/el/cleanup_dnf.sh",
       "${path.root}/scripts/el/rhn_remove_subscription.sh"
-    ],
+    ]),
     "RockyLinux" = [
       "${path.root}/scripts/el/install_open_vm_tools.sh",
       "${path.root}/scripts/el/cleanup_dnf.sh"