diff --git a/terraform/modules/aws/bastion/main.tf b/terraform/modules/aws/bastion/main.tf
index 3280c1e85..38763f755 100644
--- a/terraform/modules/aws/bastion/main.tf
+++ b/terraform/modules/aws/bastion/main.tf
@@ -5,6 +5,7 @@ resource "aws_instance" "this" {
   subnet_id                   = var.subnet_id
   vpc_security_group_ids      = var.vpc_security_group_ids
   associate_public_ip_address = var.associate_public_ip_address
+  user_data_replace_on_change = true
 
   key_name  = var.key_name
   user_data = file("${path.module}/scripts/setup.sh")
diff --git a/terraform/modules/aws/bastion/scripts/setup.sh b/terraform/modules/aws/bastion/scripts/setup.sh
index 07c9ed52b..2d3065eea 100644
--- a/terraform/modules/aws/bastion/scripts/setup.sh
+++ b/terraform/modules/aws/bastion/scripts/setup.sh
@@ -30,5 +30,5 @@ sudo cp $UPGRADE_CONF_FILE /tmp/unattended-upgrades.conf
 sudo sed -i 's/\/\/\(\s*"\${distro_id}:\${distro_codename}-updates";\)/  \1/' "${UPGRADE_CONF_FILE}"
 sudo sed -i 's/\/\/\(Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";\)/\1/' "${UPGRADE_CONF_FILE}"
 sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot \)"false";/\1 "true";/' "${UPGRADE_CONF_FILE}"
-sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-Time \)"02:00";/\1 "07:00;"/' "${UPGRADE_CONF_FILE}"
+sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-Time \)"02:00";/\1 "07:00";/' "${UPGRADE_CONF_FILE}"
 sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-WithUsers "true";\)/\1/' "${UPGRADE_CONF_FILE}"
diff --git a/terraform/modules/aws/coredns/main.tf b/terraform/modules/aws/coredns/main.tf
index e909cd7a1..822fe293a 100644
--- a/terraform/modules/aws/coredns/main.tf
+++ b/terraform/modules/aws/coredns/main.tf
@@ -7,6 +7,7 @@ resource "aws_instance" "this" {
   associate_public_ip_address = var.associate_public_ip_address
   private_ip                  = var.private_ip
   key_name                    = var.key_name
+  user_data_replace_on_change = true
 
   user_data = templatefile("${path.module}/templates/cloud-init.yaml", {
     container_name  = "coredns"
diff --git a/terraform/modules/aws/httpbin/main.tf b/terraform/modules/aws/httpbin/main.tf
index f2a427774..abfbd71a0 100644
--- a/terraform/modules/aws/httpbin/main.tf
+++ b/terraform/modules/aws/httpbin/main.tf
@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
   vpc_security_group_ids      = var.vpc_security_group_ids
   associate_public_ip_address = var.associate_public_ip_address
   private_ip                  = var.private_ip
+  user_data_replace_on_change = true
 
   key_name  = var.key_name
   user_data = file("${path.module}/scripts/setup.sh")
diff --git a/terraform/modules/aws/iperf/main.tf b/terraform/modules/aws/iperf/main.tf
index f2a427774..abfbd71a0 100644
--- a/terraform/modules/aws/iperf/main.tf
+++ b/terraform/modules/aws/iperf/main.tf
@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
   vpc_security_group_ids      = var.vpc_security_group_ids
   associate_public_ip_address = var.associate_public_ip_address
   private_ip                  = var.private_ip
+  user_data_replace_on_change = true
 
   key_name  = var.key_name
   user_data = file("${path.module}/scripts/setup.sh")
diff --git a/terraform/modules/aws/nat/main.tf b/terraform/modules/aws/nat/main.tf
index 3c159988c..58a475e10 100644
--- a/terraform/modules/aws/nat/main.tf
+++ b/terraform/modules/aws/nat/main.tf
@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
   vpc_security_group_ids      = var.vpc_security_group_ids
   associate_public_ip_address = var.associate_public_ip_address
   source_dest_check           = false
+  user_data_replace_on_change = true
 
   key_name  = var.key_name
   user_data = file("${path.module}/scripts/setup.sh")