diff --git a/deployment/step-1-root-ca.sh b/deployment/step-1-root-ca.sh
index 61bbe5d..b7e89a4 100644
--- a/deployment/step-1-root-ca.sh
+++ b/deployment/step-1-root-ca.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+# file name and password to a safebag
+
 # compile and install ndncert
 git clone https://github.com/Zhiyi-Zhang/ndncert.git
 cd ndncert
@@ -7,18 +9,18 @@
 ./waf configure
 sudo ./waf install
 sudo cp ./build/systemd/ndncert-ca.service /etc/systemd/system/
-sudo chmod 644 /etc/systemd/system/ndncert-server.service
+sudo chmod 644 /etc/systemd/system/ndncert-ca.service
 
 # prepare the CA root key
 sudo mkdir /var/lib/ndncert-ca
 sudo chown ndn /var/lib/ndncert-ca
-sudo HOME=/var/lib/ndncert -u ndn ndnsec-keygen /ndn
+sudo HOME=/var/lib/ndncert-ca -u ndn ndnsec-keygen /ndn
 
 # prepare CA configuration file
 echo -e "{\n\"ca-prefix\": \"/ndn\",\n\"ca-info\": \"NDN testbed root CA\",\n\"max-validity-period\": \"1296000\",\n\"max-suffix-length\": \"2\",\n\"supported-challenges\":\n[\n{ \"challenge\": \"pin\" }\n]\n}" > /usr/local/etc/ndncert/ca.conf
 
 # run the CA
-sudo systemctl start ndncert-server
+sudo systemctl start ndncert-ca
 sleep(2)
 
 # check the status to make sure everything is correct
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
diff --git a/wscript b/wscript
index 66d72ac..4204721 100644
--- a/wscript
+++ b/wscript
@@ -105,10 +105,5 @@
 
     bld(features='subst',
         name='ndncert-server.service',
-        source='systemd/ndncert-server.service.in',
-        target='systemd/ndncert-server.service')
-
-    bld(features='subst',
-        name='ndncert-server.service',
         source='systemd/ndncert-ca.service.in',
         target='systemd/ndncert-ca.service')
\ No newline at end of file