diff --git a/kea-ctrl-agent.service b/kea-ctrl-agent.service
index e60a7bd..0cfcf16 100644
--- a/kea-ctrl-agent.service
+++ b/kea-ctrl-agent.service
@@ -8,12 +8,12 @@ After=time-sync.target
 [Service]
 Type=notify
 User=kea
-Environment="KEA_PIDFILE_DIR=/run/kea"
-Environment="KEA_LOCKFILE_DIR=/run/kea"
+#Environment="KEA_PIDFILE_DIR=/var/run/kea"
+#Environment="KEA_LOCKFILE_DIR=/var/run/kea"
 #Environment="KEA_LOGGER_DESTINATION=/var/log/kea/early-startup.log"
-Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
-Environment="KEA_LOG_FILE_DIR=/var/log/kea"
-Environment="KEA_CONTROL_SOCKET_DIR=/run/kea"
+#Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
+#Environment="KEA_LOG_FILE_DIR=/var/log/kea"
+#Environment="KEA_CONTROL_SOCKET_DIR=/var/run/kea"
 ConfigurationDirectory=kea
 ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea
diff --git a/kea-dhcp-ddns.service b/kea-dhcp-ddns.service
index bacbd0e..03ec228 100644
--- a/kea-dhcp-ddns.service
+++ b/kea-dhcp-ddns.service
@@ -9,12 +9,12 @@ After=time-sync.target
 Type=notify
 User=kea
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-Environment="KEA_PIDFILE_DIR=/run/kea"
-Environment="KEA_LOCKFILE_DIR=/run/kea"
+#Environment="KEA_PIDFILE_DIR=/var/run/kea"
+#Environment="KEA_LOCKFILE_DIR=/var/run/kea"
 #Environment="KEA_LOGGER_DESTINATION=/var/log/kea/early-startup.log"
-Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
-Environment="KEA_LOG_FILE_DIR=/var/log/kea"
-Environment="KEA_CONTROL_SOCKET_DIR=/run/kea"
+#Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
+#Environment="KEA_LOG_FILE_DIR=/var/log/kea"
+#Environment="KEA_CONTROL_SOCKET_DIR=/var/run/kea"
 ConfigurationDirectory=kea
 ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea
diff --git a/kea-dhcp4.service b/kea-dhcp4.service
index dc7a57a..b3f3e88 100644
--- a/kea-dhcp4.service
+++ b/kea-dhcp4.service
@@ -9,12 +9,12 @@ After=time-sync.target
 Type=notify
 User=kea
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
-Environment="KEA_PIDFILE_DIR=/run/kea"
-Environment="KEA_LOCKFILE_DIR=/run/kea"
+#Environment="KEA_PIDFILE_DIR=/var/run/kea"
+#Environment="KEA_LOCKFILE_DIR=/var/run/kea"
 #Environment="KEA_LOGGER_DESTINATION=/var/log/kea/early-startup.log"
-Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
-Environment="KEA_LOG_FILE_DIR=/var/log/kea"
-Environment="KEA_CONTROL_SOCKET_DIR=/run/kea"
+#Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
+#Environment="KEA_LOG_FILE_DIR=/var/log/kea"
+#Environment="KEA_CONTROL_SOCKET_DIR=/var/run/kea"
 ConfigurationDirectory=kea
 ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea
diff --git a/kea-dhcp6.service b/kea-dhcp6.service
index 35872dc..767043e 100644
--- a/kea-dhcp6.service
+++ b/kea-dhcp6.service
@@ -9,12 +9,12 @@ After=time-sync.target
 Type=notify
 User=kea
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-Environment="KEA_PIDFILE_DIR=/run/kea"
-Environment="KEA_LOCKFILE_DIR=/run/kea"
+#Environment="KEA_PIDFILE_DIR=/var/run/kea"
+#Environment="KEA_LOCKFILE_DIR=/var/run/kea"
 #Environment="KEA_LOGGER_DESTINATION=/var/log/kea/early-startup.log"
-Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
-Environment="KEA_LOG_FILE_DIR=/var/log/kea"
-Environment="KEA_CONTROL_SOCKET_DIR=/run/kea"
+#Environment="KEA_DHCP_DATA_DIR=/var/lib/kea"
+#Environment="KEA_LOG_FILE_DIR=/var/log/kea"
+#Environment="KEA_CONTROL_SOCKET_DIR=/var/run/kea"
 ConfigurationDirectory=kea
 ConfigurationDirectoryMode=0750
 RuntimeDirectory=kea