diff --git a/scripts/setup_wizard.sh b/scripts/setup_wizard.sh
index 5c12f22..1c55361 100755
--- a/scripts/setup_wizard.sh
+++ b/scripts/setup_wizard.sh
@@ -164,9 +164,11 @@ if [ ! -f "$CERT_LOCATION" ] || [ ! -f "$KEY_LOCATION" ]; then
 fi
 
 # 3. Configure
+SERVICE_FILE="cert-renewer.service"
+TIMER_FILE="cert-renewer.timer"
 REPO_URL_BASE=https://gitea.john-stream.com/john/soteria/raw/branch/main/
-SERVICE_TEMPLATE_URL="${REPO_URL_BASE}systemd/cert-renewer.service"
-TIMER_TEMPLATE_URL="${REPO_URL_BASE}systemd/cert-renewer.timer"
+SERVICE_TEMPLATE_URL="${REPO_URL_BASE}systemd/${SERVICE_FILE}"
+TIMER_TEMPLATE_URL="${REPO_URL_BASE}systemd/${TIMER_FILE}"
 
 # 3. Execute
 # echo "Configuring $HOST_NAME..."
@@ -175,6 +177,4 @@ install_unit ${TIMER_TEMPLATE_URL}
 
 systemctl daemon-reload
 systemctl enable --now "$(basename "${TIMER_TEMPLATE_URL}")"
-
-systemctl status "$(basename "${SERVICE_TEMPLATE_URL}")" --no-pager
-systemctl status "$(basename "${TIMER_TEMPLATE_URL}")" --no-pager
+systemctl list-unit-files $SERVICE_FILE $TIMER_FILE