diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 5e3a222..d1b74c8 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -2071,7 +2071,7 @@
 	osmo_tdef_vty_groups_init(MSC_NODE, msc_tdef_group);
 
 	/* Deprecated: Old MGCP config without pooling support in MSC node: */
-	mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);
+	mgcp_client_vty_init(msc_network, MSC_NODE, msc_network->mgw.conf);
 
 #ifdef BUILD_IU
 	ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc);
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index a742771..02a85f5 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -257,7 +257,7 @@
 	net->gsup_server_port = MSC_HLR_REMOTE_PORT_DEFAULT;
 
 	net->mgw.mgw_pool = mgcp_client_pool_alloc(net);
-	mgcp_client_conf_init(&net->mgw.conf);
+	net->mgw.conf = mgcp_client_conf_alloc(net);
 	net->call_waiting = true;
 	net->lcls_permitted = false;
 
@@ -575,15 +575,15 @@
 	/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
 	 * member if there is no MGW pool configured. */
 	LOGP(DMSC, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n");
-	mgcp_client_single = mgcp_client_init(msc_network, &msc_network->mgw.conf);
+	mgcp_client_single = mgcp_client_init(msc_network, msc_network->mgw.conf);
 	if (!mgcp_client_single) {
 		LOGP(DMSC, LOGL_ERROR, "MGW (single) client initalization failed\n");
 		return -EINVAL;
 	}
 	if (mgcp_client_connect(mgcp_client_single)) {
 		LOGP(DMSC, LOGL_ERROR, "MGW (single) connect failed at (%s:%u)\n",
-		     msc_network->mgw.conf.remote_addr,
-		     msc_network->mgw.conf.remote_port);
+		     msc_network->mgw.conf->remote_addr,
+		     msc_network->mgw.conf->remote_port);
 		return -EINVAL;
 	}
 	mgcp_client_pool_register_single(msc_network->mgw.mgw_pool, mgcp_client_single);