diff --git a/email_forwarder-fail-notify.service b/email_forwarder-fail-notify.service
index 2fb9344..e9c895a 100644
--- a/email_forwarder-fail-notify.service
+++ b/email_forwarder-fail-notify.service
@@ -3,7 +3,7 @@ Description=Email Forwarder Failure Notification
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/curl -fsS --retry 3 ${UPTIME_FAIL_URL}
+ExecStart=/bin/sh -c '/usr/bin/curl -fsS --retry 3 "$UPTIME_FAIL_URL"'
 
 [Install]
 WantedBy=default.target
\ No newline at end of file
diff --git a/email_forwarder.service b/email_forwarder.service
index 1d653ef..664b334 100644
--- a/email_forwarder.service
+++ b/email_forwarder.service
@@ -3,8 +3,9 @@ Description=Email Forwarder
 
 [Service]
 ExecStart=${PROJECT_DIR}/venv/bin/python -m email_forwarder
-ExecStartPost=/usr/bin/curl -fsS --retry 3 ${UPTIME_SUCCESS_URL}
+EnvironmentFile=${PROJECT_DIR}/.env
+ExecStartPost=/bin/sh -c '/usr/bin/curl -fsS --retry 3 "$UPTIME_SUCCESS_URL"'
 OnFailure=email_forwarder-fail-notify.service
 
 [Install]
-WantedBy=default.target
\ No newline at end of file
+WantedBy=default.target