diff --git a/core/lib/common/worker.js b/core/lib/common/worker.js
index 41b6cdd99..2de8cea65 100644
--- a/core/lib/common/worker.js
+++ b/core/lib/common/worker.js
@@ -331,8 +331,8 @@ module.exports = class Worker {
 				};
 			} else {
 				config = {
-					host: 'ssh.balena-devices.com',
-					port: '22',
+					host: this.sshConfig.host,
+					port: this.sshConfig.port,
 					username: this.username,
 				};
 				command = `host ${target} ${command}`;
diff --git a/core/lib/components/balena/sdk.js b/core/lib/components/balena/sdk.js
index 923b1a6c0..274538843 100644
--- a/core/lib/components/balena/sdk.js
+++ b/core/lib/components/balena/sdk.js
@@ -109,7 +109,7 @@ module.exports = class BalenaSDK {
 					{
 						host: this.sshConfig.host,
 						username: await this.balena.auth.whoami(),
-						port: this.sshConfig.sshPort,
+						port: this.sshConfig.port,
 					},
 				);