diff --git a/docs/install/templates/base-os/nfs.md.j2 b/docs/install/templates/base-os/nfs.md.j2
index cad384c344..5b2955aec4 100644
--- a/docs/install/templates/base-os/nfs.md.j2
+++ b/docs/install/templates/base-os/nfs.md.j2
@@ -10,7 +10,7 @@ example configuration.
 ```bash
 # Install and Start NFS server
 {{ pkg_install }} nfs-utils
-systemctl start nfs-server.service
+systemctl start nfs-server
 
 # Create OpenHPC public packages directory
 mkdir -p /opt/ohpc/pub
diff --git a/docs/install/templates/base-os/time.md.j2 b/docs/install/templates/base-os/time.md.j2
index 185649338b..ea86e1da74 100644
--- a/docs/install/templates/base-os/time.md.j2
+++ b/docs/install/templates/base-os/time.md.j2
@@ -9,7 +9,7 @@ to serve as a local time server for the cluster, issue the following:
 <!-- ohpc_comment Enable NTP services on head node -->
 ```bash
 {{ pkg_install }} chrony
-systemctl enable chronyd.service
+systemctl enable chronyd
 echo "local stratum 10" >> /etc/chrony.conf
 echo "server ${ntp_server}" >> /etc/chrony.conf
 echo "allow all" >> /etc/chrony.conf
diff --git a/docs/install/templates/customize/memlimits.md.j2 b/docs/install/templates/customize/memlimits.md.j2
index 30194e2f11..5c3e18def5 100644
--- a/docs/install/templates/customize/memlimits.md.j2
+++ b/docs/install/templates/customize/memlimits.md.j2
@@ -16,6 +16,7 @@ echo '* soft memlock unlimited' >> \
   /etc/security/limits.d/40-ohpc-limits.conf
 echo '* hard memlock unlimited' >> \
   /etc/security/limits.d/40-ohpc-limits.conf
+
 # Update memlock settings on compute
 {{ compute_echo("* soft memlock unlimited", "/etc/security/limits.d/40-ohpc-limits.conf") }}
 {{ compute_echo("* hard memlock unlimited", "/etc/security/limits.d/40-ohpc-limits.conf") }}
diff --git a/docs/install/templates/customize/nhc.md.j2 b/docs/install/templates/customize/nhc.md.j2
index 8e423eae23..db6477789b 100644
--- a/docs/install/templates/customize/nhc.md.j2
+++ b/docs/install/templates/customize/nhc.md.j2
@@ -33,6 +33,7 @@ bad nodes, reducing the risk of system-induced job failures.
 ```bash
 # Register as SLURM's health check program
 echo "HealthCheckProgram=/usr/sbin/nhc" >> /etc/slurm/slurm.conf
+
 # execute every five minutes
 echo "HealthCheckInterval=300" >> /etc/slurm/slurm.conf
 ```
diff --git a/docs/install/templates/network/infiniband/head-node.md.j2 b/docs/install/templates/network/infiniband/head-node.md.j2
index 41db149597..18d347aa26 100644
--- a/docs/install/templates/network/infiniband/head-node.md.j2
+++ b/docs/install/templates/network/infiniband/head-node.md.j2
@@ -10,7 +10,7 @@ drivers to the chosen *head node*.
 {{ pkg_group_install }} "InfiniBand Support"
 # Load IB services
 udevadm trigger --type=devices --action=add
-systemctl restart rdma-load-modules@infiniband.service
+systemctl restart rdma-load-modules@infiniband
 ```
 <!-- ohpc_fi -->
 <!-- ohpc_end -->
@@ -43,6 +43,7 @@ sed -i "s/ipoib_netmask/${ipoib_netmask}/" \
 # configure NetworkManager to *not* override local /etc/resolv.conf
 echo "[main]"   >  /etc/NetworkManager/conf.d/90-dns-none.conf
 echo "dns=none" >> /etc/NetworkManager/conf.d/90-dns-none.conf
+
 # Start up NetworkManager to initiate ib0
 systemctl start NetworkManager
 
diff --git a/docs/install/templates/provisioner/openchami/setup.md.j2 b/docs/install/templates/provisioner/openchami/setup.md.j2
index 68a640efed..173748f156 100644
--- a/docs/install/templates/provisioner/openchami/setup.md.j2
+++ b/docs/install/templates/provisioner/openchami/setup.md.j2
@@ -101,8 +101,8 @@ containers to start.
 <!-- ohpc_comment Reload Systemd daemon and start the s3 (minio) and container registry -->
 ```bash
 systemctl daemon-reload
-systemctl start minio.service
-systemctl start registry.service
+systemctl start minio
+systemctl start registry
 ```
 <!-- ohpc_end -->
 
diff --git a/docs/install/templates/provisioner/warewulf/compute-install-slurm.md.j2 b/docs/install/templates/provisioner/warewulf/compute-install-slurm.md.j2
index 1bda705539..54f4936b90 100644
--- a/docs/install/templates/provisioner/warewulf/compute-install-slurm.md.j2
+++ b/docs/install/templates/provisioner/warewulf/compute-install-slurm.md.j2
@@ -6,8 +6,8 @@ wwctl image exec --build=false {{ baseos }} -- /bin/bash -ex <<- EOF
   dnf -y install ohpc-slurm-client
 
   # Enable services to start on boot
-  systemctl enable munge.service
-  systemctl enable slurmd.service
+  systemctl enable munge
+  systemctl enable slurmd
 
   # Add Network Time Protocol (NTP) support
   dnf -y install chrony
diff --git a/docs/install/templates/scheduler/slurm/install.md.j2 b/docs/install/templates/scheduler/slurm/install.md.j2
index c68d0c2a81..1da126171b 100644
--- a/docs/install/templates/scheduler/slurm/install.md.j2
+++ b/docs/install/templates/scheduler/slurm/install.md.j2
@@ -14,6 +14,7 @@ also needs to be running on all hosts within the resource management pool.
 
 # Use ohpc-provided file for starting SLURM configuration
 cp /etc/slurm/slurm.conf.ohpc /etc/slurm/slurm.conf
+
 # Setup default cgroups file
 cp /etc/slurm/cgroup.conf.example /etc/slurm/cgroup.conf