diff --git a/files/rke_setup/etc/firewalld/services/rke.xml b/files/rke_setup/etc/firewalld/services/rke.xml
new file mode 100644
index 0000000..662d740
--- /dev/null
+++ b/files/rke_setup/etc/firewalld/services/rke.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>RKE API</short>
+  <description>Open port 6443 for Kubernetes API Server.</description>
+  <port protocol="tcp" port="6443"/>
+</service>
diff --git a/files/rke_setup/usr/lib/systemd/system/create_rke_user.service b/files/rke_setup/usr/lib/systemd/system/create_rke_user.service
index 9aab41c..f7132a4 100644
--- a/files/rke_setup/usr/lib/systemd/system/create_rke_user.service
+++ b/files/rke_setup/usr/lib/systemd/system/create_rke_user.service
@@ -7,8 +7,8 @@ Type=oneshot
 ExecStart=/usr/libexec/rke2/create_rke_user.sh
 
 # Disable and mask the service after successful execution
-ExecStartPost=-/bin/systemctl disable --now create_rke_user.service
-ExecStartPost=-/bin/systemctl mask --now create_rke_user.service
+ExecStartPost=-/bin/systemctl disable create_rke_user.service
+ExecStartPost=-/bin/systemctl mask create_rke_user.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/rke_setup/usr/libexec/rke2/create_rke_user.sh b/files/rke_setup/usr/libexec/rke2/create_rke_user.sh
index 29e810e..db94bab 100755
--- a/files/rke_setup/usr/libexec/rke2/create_rke_user.sh
+++ b/files/rke_setup/usr/libexec/rke2/create_rke_user.sh
@@ -12,4 +12,3 @@ echo "Adding 'rke' to docker group"
 usermod -aG docker rke
 
 echo "Done"
-exit 0