diff --git a/CentOS-8-Container.ks b/CentOS-8-Container.ks
index 7a3bd39..33ae605 100644
--- a/CentOS-8-Container.ks
+++ b/CentOS-8-Container.ks
@@ -8,7 +8,7 @@
 #
 
 # Basic setup information
-install
+text
 keyboard us
 rootpw --lock --iscrypted locked
 timezone --isUtc --nontp UTC
@@ -17,7 +17,7 @@ firewall --disabled
 network --bootproto=dhcp --device=link --activate --onboot=on
 shutdown
 bootloader --disable
-lang en_US
+lang en_US.UTF-8
 
 
 # Disk setup
diff --git a/CentOS-8-EC2.ks b/CentOS-8-EC2.ks
index 1c4d458..ebd6e61 100644
--- a/CentOS-8-EC2.ks
+++ b/CentOS-8-EC2.ks
@@ -1,5 +1,6 @@
+text
 auth --enableshadow --passalgo=sha512
-reboot
+shutdown
 firewall --enabled --service=ssh
 firstboot --disable
 ignoredisk --only-use=vda
@@ -105,7 +106,7 @@ echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
 dnf clean all
 
 # XXX instance type markers - MUST match CentOS Infra expectation
-echo 'genclo' > /etc/yum/vars/infra
+echo 'ec2' > /etc/yum/vars/infra
 
 # change dhcp client retry/timeouts to resolve #6866
 cat  >> /etc/dhcp/dhclient.conf << EOF
diff --git a/CentOS-8-GenericCloud.ks b/CentOS-8-GenericCloud.ks
index 476d9d9..e95afe5 100644
--- a/CentOS-8-GenericCloud.ks
+++ b/CentOS-8-GenericCloud.ks
@@ -1,5 +1,6 @@
+text
 auth --enableshadow --passalgo=sha512
-reboot
+shutdown
 firewall --enabled --service=ssh
 firstboot --disable
 ignoredisk --only-use=vda
diff --git a/CentOS-8-x86_64-Vagrant.ks b/CentOS-8-x86_64-Vagrant.ks
index 3fe833d..76f4662 100644
--- a/CentOS-8-x86_64-Vagrant.ks
+++ b/CentOS-8-x86_64-Vagrant.ks
@@ -18,7 +18,7 @@ part / --fstype=xfs --asprimary --size=1024 --grow --ondisk=vda
 
 user --name=vagrant --plaintext --password=vagrant
 
-reboot
+shutdown
 
 %packages --instLangs=en
 bash-completion