diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index e7cc8af..5bd441d 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -8,13 +8,12 @@ bootloader --location=mbr
 
 part /boot/fw --size=30 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
-part swap --size=512 --fstype swap --asprimary
 part / --size=2800 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap
 
 %include fedora-repo.ks
 
@@ -22,6 +21,7 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
 @core
 @standard
 @hardware-support
+zram
 
 kernel
 # remove this in %post
diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks
index 604d9af..8212ed1 100644
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -14,7 +14,7 @@ timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,zram-swap
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@@ -33,6 +33,7 @@ firstboot --reconfig
 @core
 @standard
 @hardware-support
+zram
 
 kernel
 # remove this in %post
diff --git a/fedora-disk-minimal.ks b/fedora-disk-minimal.ks
index 643b282..2ffc819 100644
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -1,9 +1,9 @@
 %include fedora-disk-base.ks
 %include fedora-minimal-common.ks
 
-services --enabled=sshd,NetworkManager,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
 
-autopart --type=plain
+autopart --type=plain --noswap
 
 %packages
 -xkeyboard-config
diff --git a/fedora-disk-server.ks b/fedora-disk-server.ks
index 8699d6c..da892c6 100644
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -1,8 +1,8 @@
 %include fedora-disk-base.ks
 
-services --enabled=sshd,NetworkManager,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
 
-autopart
+autopart --noswap
 
 %packages
 # install the default groups for the server environment since installing the environment is not working
diff --git a/fedora-disk-workstation.ks b/fedora-disk-workstation.ks
index 7d95b45..488bbd0 100644
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -4,9 +4,9 @@
 
 bootloader --append="cma=256MB"
 
-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,zram-swap
 
-autopart --type=plain
+autopart --type=plain --noswap
 
 %packages
 -initial-setup
diff --git a/fedora-iot.ks b/fedora-iot.ks
index 757c23d..54e14d5 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -13,7 +13,7 @@ rootpw --lock --iscrypted locked
 bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8 console=ttyS1,115200n8 console=ttyAMA0,115200n8 net.ifnames=0 modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=NetworkManager,sshd,rngd,initial-setup
+services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
 
 # tell Initial Setup to run in the reconfig mode
 firstboot --reconfig --enable