diff --git a/systemd/ndncert-ca.service.in b/systemd/ndncert-ca.service.in
index dadcf5a..5ac1a2b 100644
--- a/systemd/ndncert-ca.service.in
+++ b/systemd/ndncert-ca.service.in
@@ -2,9 +2,7 @@
 Description=Certificate Management Identity Management Service for NDN
 
 [Service]
-Environment=HOME=%S/ndncert
-EnvironmentFile=-@SYSCONFDIR@/ndncert
-EnvironmentFile=-@SYSCONFDIR@/default/ndncert
+Environment=HOME=%S/ndncert-ca
 ExecStart=@BINDIR@/ndncert-ca-server
 Restart=on-failure
 RestartPreventExitStatus=2
@@ -12,3 +10,4 @@
 
 [Install]
 WantedBy=multi-user.target
+Alias=ndncert.service
\ No newline at end of file
diff --git a/systemd/ndncert-server.service.in b/systemd/ndncert-server.service.in
deleted file mode 100644
index 7ebecfa..0000000
--- a/systemd/ndncert-server.service.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Certificate Management Service for NDN
-Wants=nfd.service
-After=nfd.service
-
-[Service]
-Type=simple
-Environment=HOME=%S/ndn/ndncert
-EnvironmentFile=-@SYSCONFDIR@/default/ndncert
-ExecStart=@BINDIR@/ndncert-ca-server $FLAGS
-Restart=on-failure
-RestartPreventExitStatus=2
-User=ndncert
-
-[Install]
-WantedBy=multi-user.target
-Alias=ndncert.service
-Alias=ndncert-ca.service
\ No newline at end of file