diff --git a/elements/manila-ssh/install.d/fetch-public-ssh-keys.service b/elements/manila-ssh/install.d/fetch-public-ssh-keys.service
index 18ede0c..7db3d9f 100644
--- a/elements/manila-ssh/install.d/fetch-public-ssh-keys.service
+++ b/elements/manila-ssh/install.d/fetch-public-ssh-keys.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=Fetch Public Keys
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
+Type=oneshot
 ExecStart=/usr/local/sbin/fetch-public-ssh-keys.sh
 
 [Install]