diff --git a/config/deploy/production-ci.rb b/config/deploy/production-ci.rb
index 16498ee..70e8c42 100644
--- a/config/deploy/production-ci.rb
+++ b/config/deploy/production-ci.rb
@@ -1,9 +1,11 @@
 set :rails_env, :production
 
 server 'webdns4.grnet.gr', user: 'deployer', roles: %w(web app db)
 
 set :ssh_options, forward_agent: false, port: 29
 
-#Override rm and ln commands with sudo, for use with jenkins deployer
-SSHKit.config.command_map[:rm] = 'sudo rm'
-SSHKit.config.command_map[:ln] = 'sudo ln'
+#Override commands with sudo, for use with jenkins deployer
+SSHKit.config.command_map = Hash.new do |hash, command|
+  hash[command] = "sudo -u webdns #{command}"
+end
+
diff --git a/config/deploy/test.rb b/config/deploy/test.rb
index 0d937ab..bdc7820 100644
--- a/config/deploy/test.rb
+++ b/config/deploy/test.rb
@@ -1,10 +1,11 @@
 set :rails_env, :production
 
 server 'webdns4.test.grnet.gr', user: 'deployer', roles: %w(web app db)
 
 set :ssh_options, forward_agent: false, port: 29
 
-#Override rm and ln commands with sudo, for use with jenkins deployer
-SSHKit.config.command_map[:rm] = 'sudo rm'
-SSHKit.config.command_map[:ln] = 'sudo ln'
+#Override commands with sudo, for use with jenkins deployer
+SSHKit.config.command_map = Hash.new do |hash, command|
+  hash[command] = "sudo -u webdns #{command}"
+end