diff --git a/openair-cn/OAI_EPC/oai_epc.c b/openair-cn/OAI_EPC/oai_epc.c
index 05f5944b0499f6e6095c85946c5e16e8ee576a9a..4b8e8e31460980fef70409821f13e1c9eac4345f 100644
--- a/openair-cn/OAI_EPC/oai_epc.c
+++ b/openair-cn/OAI_EPC/oai_epc.c
@@ -82,13 +82,14 @@ int main(int argc, char *argv[])
     CHECK_INIT_RETURN(sctp_init(&mme_config));
     CHECK_INIT_RETURN(udp_init(&mme_config));
     CHECK_INIT_RETURN(s1ap_mme_init(&mme_config));
-    CHECK_INIT_RETURN(sgi_init(&mme_config));
+    // moved CHECK_INIT_RETURN(sgi_init(&spgw_config.pgw_config));
     CHECK_INIT_RETURN(gtpv1u_init(&mme_config));
     CHECK_INIT_RETURN(mme_app_init(&mme_config));
 
     CHECK_INIT_RETURN(s6a_init(&mme_config));
 
-    CHECK_INIT_RETURN(sgw_lite_init(&mme_config));
+    CHECK_INIT_RETURN(sgw_lite_init(mme_config.config_file));
+    CHECK_INIT_RETURN(sgi_init(&spgw_config.pgw_config));
 
     /* Handle signals here */
     itti_wait_tasks_end();
diff --git a/openair-cn/OAI_SGW/oai_sgw.c b/openair-cn/OAI_SGW/oai_sgw.c
index df9efade2ea75bf430e52628e3990cb73e535349..4b54f0740fa990553640726605dfdc253a012c66 100644
--- a/openair-cn/OAI_SGW/oai_sgw.c
+++ b/openair-cn/OAI_SGW/oai_sgw.c
@@ -65,9 +65,9 @@ int main(int argc, char *argv[])
     CHECK_INIT_RETURN(udp_init(&mme_config));
     CHECK_INIT_RETURN(s11_sgw_init(&mme_config));
     CHECK_INIT_RETURN(gtpv1u_init(&mme_config));
-    CHECK_INIT_RETURN(sgi_init(&mme_config));
+    CHECK_INIT_RETURN(sgi_init(&pgw_config));
 
-    CHECK_INIT_RETURN(sgw_lite_init(&mme_config));
+    CHECK_INIT_RETURN(sgw_lite_init(mme_config.config_file));
 
     /* Handle signals here */
     itti_wait_tasks_end();