diff --git a/templates/swh/deploy/scheduler/ssh-ghtorrent.service.erb b/templates/swh/deploy/scheduler/ssh-ghtorrent.service.erb
index b27ab94b..915fcec3 100644
--- a/templates/swh/deploy/scheduler/ssh-ghtorrent.service.erb
+++ b/templates/swh/deploy/scheduler/ssh-ghtorrent.service.erb
@@ -1,19 +1,19 @@
 # SSH Ghtorrent unit file
 # Managed by puppet class profile::swh::deploy::scheduler::updater::consumer
 # Changes will be overwritten
 
 [Unit]
 Description=SSH connection to GHTorrent infra
-Requires=network.target 
-After=network.target 
+Requires=network-online.target
+After=network-online.target
 
 [Service]
-User=<%= @backend_user %>
-Group=<%= @backend_group %>
+User=<%= @consumer_user %>
+Group=<%= @consumer_group %>
 Type=simple
-ExecStart=ssh -i <%= @ghtorrent_private_key %> -L <%= @local_port %>:streamer.ghtorrent.org:5672 ghtorrent@streamer.ghtorrent.org
+ExecStart=/usr/bin/ssh -i <%= @ghtorrent_private_key %> -L <%= @local_port %>:streamer.ghtorrent.org:5672 ghtorrent@streamer.ghtorrent.org
 Restart=always
 RestartSec=10
 
 [Install]
 WantedBy=multi-user.target