diff --git a/resources/klipper.env b/resources/klipper.env
new file mode 100644
index 0000000..1f16a6e
--- /dev/null
+++ b/resources/klipper.env
@@ -0,0 +1 @@
+KLIPPER_ARGS="/home/%USER%/klipper/klippy/klippy.py %CFG% -I %PRINTER% -l %LOG% -a %UDS%"
\ No newline at end of file
diff --git a/resources/klipper.service b/resources/klipper.service
index 5bf8f5a..bc6063d 100644
--- a/resources/klipper.service
+++ b/resources/klipper.service
@@ -1,7 +1,5 @@
-#Systemd Klipper Service
-
 [Unit]
-Description=Systemd Klipper Service for instance klipper-%INST%
+Description=Klipper 3D Printer Firmware SV1 %INST%
 Documentation=https://www.klipper3d.org/
 After=network.target
 Wants=udev.target
@@ -10,13 +8,11 @@ Wants=udev.target
 WantedBy=multi-user.target
 
 [Service]
-Environment=KLIPPER_CONFIG=%CFG%
-Environment=KLIPPER_LOG=%LOG%
-Environment=KLIPPER_SOCKET=%UDS%
-Environment=KLIPPER_PRINTER=%PRINTER%
 Type=simple
 User=%USER%
 RemainAfterExit=yes
-ExecStart=%ENV%/bin/python %DIR%/klippy/klippy.py ${KLIPPER_CONFIG} -I ${KLIPPER_PRINTER} -l ${KLIPPER_LOG} -a ${KLIPPER_SOCKET}
+WorkingDirectory=/home/%USER%/klipper
+EnvironmentFile=%ENV_FILE%
+ExecStart=%ENV%/bin/python $KLIPPER_ARGS
 Restart=always
 RestartSec=10
\ No newline at end of file