diff --git a/systemd/deploy-over-testbed.md b/deployment/deploy-over-testbed.md
similarity index 100%
rename from systemd/deploy-over-testbed.md
rename to deployment/deploy-over-testbed.md
diff --git a/systemd/step-1-root-ca.sh b/deployment/step-1-root-ca.sh
similarity index 66%
rename from systemd/step-1-root-ca.sh
rename to deployment/step-1-root-ca.sh
index 26e7940..61bbe5d 100644
--- a/systemd/step-1-root-ca.sh
+++ b/deployment/step-1-root-ca.sh
@@ -5,23 +5,21 @@
 cd ndncert
 git checkout origin/v0.3
 ./waf configure
-./waf install
-
-# set up systemd file for linux service
-sudo cp ./build/systemd/ndncert-server.service /etc/systemd/system/
+sudo ./waf install
+sudo cp ./build/systemd/ndncert-ca.service /etc/systemd/system/
 sudo chmod 644 /etc/systemd/system/ndncert-server.service
 
-# update CA configuration file
+# 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
+
+# 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
 
-# sudo HOME=/var/lib/ndn/ndncert-ca -u ndn ndnsec-keygen /ndn
-
-# prepare
-mkdir /var/lib/ndn/ndncert-ca
-chown ndn /var/lib/ndn/ndncert-ca
-
 # run the CA
 sudo systemctl start ndncert-server
+sleep(2)
 
 # check the status to make sure everything is correct
 sudo systemctl status ndncert-server
\ No newline at end of file
diff --git a/systemd/step-2-site-ca.sh b/deployment/step-2-site-ca.sh
similarity index 100%
rename from systemd/step-2-site-ca.sh
rename to deployment/step-2-site-ca.sh
diff --git a/systemd/ndncert-ca.service.in b/systemd/ndncert-ca.service.in
new file mode 100644
index 0000000..dadcf5a
--- /dev/null
+++ b/systemd/ndncert-ca.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Certificate Management Identity Management Service for NDN
+
+[Service]
+Environment=HOME=%S/ndncert
+EnvironmentFile=-@SYSCONFDIR@/ndncert
+EnvironmentFile=-@SYSCONFDIR@/default/ndncert
+ExecStart=@BINDIR@/ndncert-ca-server
+Restart=on-failure
+RestartPreventExitStatus=2
+User=ndn
+
+[Install]
+WantedBy=multi-user.target
diff --git a/wscript b/wscript
index 217adbf..601cbfc 100644
--- a/wscript
+++ b/wscript
@@ -109,3 +109,8 @@
             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')