diff --git a/fedora-disk-server.ks b/fedora-disk-server.ks
index 9fb1217..04dec7b 100644
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -26,8 +26,7 @@ fedora-release-server
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+systemctl set-default multi-user.target
 echo .
 
 %end
diff --git a/fedora-disk-xbase.ks b/fedora-disk-xbase.ks
index 7e168d2..c593b7b 100644
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@@ -17,6 +17,6 @@ glibc-all-langpacks
 
 %post
 # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+systemctl set-default graphical.target
 
 %end
diff --git a/fedora-eln-guest.ks b/fedora-eln-guest.ks
index ce2b301..c9e2955 100644
--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@@ -136,8 +136,7 @@ passwd -l root
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+systemctl set-default multi-user.target
 echo .
 
 # this is installed by default but we don't need it in virt
diff --git a/fedora-minimal-common.ks b/fedora-minimal-common.ks
index b82c732..cb4677e 100644
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -17,8 +17,7 @@ NetworkManager-wifi
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+systemctl set-default multi-user.target
 echo .
 
 %end
diff --git a/fedora-server-vm-full.ks b/fedora-server-vm-full.ks
index 8f7b4e2..1b43da0 100644
--- a/fedora-server-vm-full.ks
+++ b/fedora-server-vm-full.ks
@@ -193,8 +193,7 @@ sync /
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+systemctl set-default multi-user.target
 echo .
 
 %end