diff --git a/noip-duc.container b/noip-duc.container
index be621f5..b63b50d 100644
--- a/noip-duc.container
+++ b/noip-duc.container
@@ -1,11 +1,13 @@
+[Unit]
+Description=No-IP Dynamic Update Client
+After=network-online.target
+Wants=network-online.target
+
 [Container]
 ContainerName=noip-duc
 Image=ghcr.io/noipcom/noip-duc:latest
 AutoUpdate=registry
-Environment=NOIP_USERNAME=wr4y1c4
-Environment=NOIP_PASSWORD=B78aYH6qZEJU
-Environment=NOIP_HOSTNAMES=all.ddnskey.com
-Environment=NOIP_CHECK_INTERVAL=2m
+EnvironmentFile=noip-duc.env
 
 [Service]
 Restart=always
diff --git a/noip-duc.env b/noip-duc.env
new file mode 100644
index 0000000..b5efbac
--- /dev/null
+++ b/noip-duc.env
@@ -0,0 +1,4 @@
+NOIP_USERNAME=wr4y1c4
+NOIP_PASSWORD=B78aYH6qZEJU
+NOIP_HOSTNAMES=all.ddnskey.com
+NOIP_CHECK_INTERVAL=2m