diff --git a/openbsc/src/ipaccess/abisip-find.c b/openbsc/src/ipaccess/abisip-find.c
index 5b36272..21d9f22 100644
--- a/openbsc/src/ipaccess/abisip-find.c
+++ b/openbsc/src/ipaccess/abisip-find.c
@@ -200,9 +200,7 @@
 		exit(1);
 	}
 
-	timer.cb = timer_cb;
-	timer.data = &bfd;
-
+	osmo_timer_setup(&timer, timer_cb, &bfd);
 	osmo_timer_schedule(&timer, 5, 0);
 
 	printf("Trying to find ip.access BTS by broadcast UDP...\n");
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index 9e8ec88..d367442 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -1059,8 +1059,7 @@
 	if (!ipp)
 		return -ENOMEM;
 	INIT_LLIST_HEAD(&ipp->bts_list);
-	ipp->reconn_timer.cb = reconn_tmr_cb;
-	ipp->reconn_timer.data = ipp;
+	osmo_timer_setup(&ipp->reconn_timer, reconn_tmr_cb, ipp);
 
 	/* Listen for OML connections */
 	ret = make_sock(&ipp->oml_listen_fd, IPPROTO_TCP, INADDR_ANY,