diff --git a/src/common/main.c b/src/common/main.c
index a67364e1e..2b86a774d 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -367,8 +367,7 @@ int bts_main(int argc, char **argv)
 
 	bts_controlif_setup(g_bts, OSMO_CTRL_PORT_BTS);
 
-	rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(),
-			       g_vty_port_num);
+	rc = telnet_init_default(tall_bts_ctx, NULL, g_vty_port_num);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing telnet\n");
 		exit(1);
diff --git a/src/osmo-bts-lc15/misc/lc15bts_mgr.c b/src/osmo-bts-lc15/misc/lc15bts_mgr.c
index b258d0cb9..745ff8bc1 100644
--- a/src/osmo-bts-lc15/misc/lc15bts_mgr.c
+++ b/src/osmo-bts-lc15/misc/lc15bts_mgr.c
@@ -319,7 +319,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	rc = telnet_init(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
+	rc = telnet_init_default(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing telnet\n");
 		exit(1);
diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
index 9469259c0..be5441001 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
@@ -306,7 +306,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	rc = telnet_init(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
+	rc = telnet_init_default(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing telnet\n");
 		exit(1);
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
index 607799109..af41705cf 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	rc = telnet_init(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
+	rc = telnet_init_default(tall_mgr_ctx, NULL, OSMO_VTY_PORT_BTSMGR);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing telnet\n");
 		exit(1);