diff --git a/elements/manila-ssh/install.d/60-fetch-public-ssh-keys b/elements/manila-ssh/install.d/60-fetch-public-ssh-keys
index 0665990..826989f 100755
--- a/elements/manila-ssh/install.d/60-fetch-public-ssh-keys
+++ b/elements/manila-ssh/install.d/60-fetch-public-ssh-keys
@@ -13,6 +13,9 @@ install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.sh /usr/lo
 DIB_INIT_SYSTEM=$(dib-init-system)
 if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
     install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.conf /etc/init/fetch-public-ssh-keys.conf
+elif [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
+    install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.service /etc/systemd/system
+    systemctl enable fetch-public-ssh-keys
 else
     echo "Not supported"
 fi
diff --git a/elements/manila-ssh/install.d/fetch-public-ssh-keys.service b/elements/manila-ssh/install.d/fetch-public-ssh-keys.service
new file mode 100644
index 0000000..18ede0c
--- /dev/null
+++ b/elements/manila-ssh/install.d/fetch-public-ssh-keys.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Fetch Public Keys
+After=network.target
+
+[Service]
+ExecStart=/usr/local/sbin/fetch-public-ssh-keys.sh
+
+[Install]
+WantedBy=multi-user.target