diff --git a/bionic.user b/bionic.user
index ef51f4c..9370a4b 100644
--- a/bionic.user
+++ b/bionic.user
@@ -100,7 +100,8 @@ ca_certs:
 # post boot
 runcmd:
   - [ sudo, -u, buildbot, --, buildbot-worker, create-worker, 
-    /var/lib/buildbot/workers/default, 192.168.43.1,
+    /var/lib/buildbot/workers/default, '--use-tls',
+    'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
   - [ systemctl, enable, buildbot-worker@default.service ]
   - [ systemctl, start, buildbot-worker@default.service ]
diff --git a/focal.user b/focal.user
index ef51f4c..9370a4b 100644
--- a/focal.user
+++ b/focal.user
@@ -100,7 +100,8 @@ ca_certs:
 # post boot
 runcmd:
   - [ sudo, -u, buildbot, --, buildbot-worker, create-worker, 
-    /var/lib/buildbot/workers/default, 192.168.43.1,
+    /var/lib/buildbot/workers/default, '--use-tls',
+    'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
   - [ systemctl, enable, buildbot-worker@default.service ]
   - [ systemctl, start, buildbot-worker@default.service ]
diff --git a/jammy.user b/jammy.user
index b5193ea..7eaebcc 100644
--- a/jammy.user
+++ b/jammy.user
@@ -101,7 +101,8 @@ ca_certs:
 # post boot
 runcmd:
   - [ sudo, -u, buildbot, --, buildbot-worker, create-worker, 
-    /var/lib/buildbot/workers/default, 192.168.43.1,
+    /var/lib/buildbot/workers/default, '--use-tls',
+    'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
   - [ systemctl, enable, buildbot-worker@default.service ]
   - [ systemctl, start, buildbot-worker@default.service ]
diff --git a/trusty.user b/trusty.user
index 0303e4c..6ba91c3 100644
--- a/trusty.user
+++ b/trusty.user
@@ -112,7 +112,8 @@ write_files:
 # post boot
 runcmd:
   - [ sudo, -u, buildbot, --, buildslave, create-slave, 
-    /var/lib/buildbot/slaves/default, 192.168.43.1,
+    /var/lib/buildbot/slaves/default, '--use-tls',
+    'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
   - [ systemctl, enable, buildslave ]
   - [ systemctl, start, buildslave ]
diff --git a/xenial.user b/xenial.user
index cd46b63..da86b97 100644
--- a/xenial.user
+++ b/xenial.user
@@ -117,7 +117,8 @@ write_files:
 # post boot
 runcmd:
   - [ sudo, -u, buildbot, --, buildslave, create-slave, 
-    /var/lib/buildbot/slaves/default, 192.168.43.1,
+    /var/lib/buildbot/slaves/default, '--use-tls',
+    'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
   - [ systemctl, enable, buildslave ]
   - [ systemctl, start, buildslave ]