diff --git a/README.md b/README.md
index f13651b..282a618 100644
--- a/README.md
+++ b/README.md
@@ -38,5 +38,5 @@ This will set up the virtual environment, systemd services, and provide post-ins
 ## Troubleshooting
 
 - Logs: `journalctl --user -u email_forwarder.service`
-- Test: `source venv/bin/activate && python main.py`
+- Test: `source venv/bin/activate && python email_forwarder.py`
 - Timezone issues: Adjust UTC offset in script if needed.
\ No newline at end of file
diff --git a/main.py b/email_forwarder.py
similarity index 100%
rename from main.py
rename to email_forwarder.py
diff --git a/email_forwarder.service b/email_forwarder.service
index b096f2c..5504c82 100644
--- a/email_forwarder.service
+++ b/email_forwarder.service
@@ -2,9 +2,7 @@
 Description=Email Forwarder
 
 [Service]
-Type=oneshot
-WorkingDirectory=${PROJECT_DIR}
-ExecStart=${PROJECT_DIR}/venv/bin/python main.py
+ExecStart=${PROJECT_DIR}/venv/bin/python ${PROJECT_DIR}/email_forwarder.py
 ExecStartPost=/usr/bin/curl -fsS --retry 3 ${UPTIME_SUCCESS_URL}
 OnFailure=email_forwarder-fail-notify.service