diff --git a/README.md b/README.md
index a0ea29463d..148cd08402 100644
--- a/README.md
+++ b/README.md
@@ -265,6 +265,8 @@ Documentation=https://k3s.io
 After=network.target
 
 [Service]
+Type=notify
+EnvironmentFile=/etc/systemd/system/k3s.service.env
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/k3s server
@@ -274,6 +276,7 @@ LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TasksMax=infinity
+TimeoutStartSec=infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/install.sh b/install.sh
index 9224167449..baa7703672 100755
--- a/install.sh
+++ b/install.sh
@@ -402,6 +402,7 @@ LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TasksMax=infinity
+TimeoutStartSec=infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/k3s.service b/k3s.service
index 822ae13bbc..77d170f50a 100644
--- a/k3s.service
+++ b/k3s.service
@@ -13,6 +13,7 @@ LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TasksMax=infinity
+TimeoutStartSec=infinity
 
 [Install]
 WantedBy=multi-user.target