diff --git a/cmake_targets/epc_build_oai/CMakeLists.template b/cmake_targets/epc_build_oai/CMakeLists.template
index c1d80ec1ae045ba8502bbc64a0231cd5d0fcd4d1..1fef3d0147610a53a20eb05e2855c71572617663 100644
--- a/cmake_targets/epc_build_oai/CMakeLists.template
+++ b/cmake_targets/epc_build_oai/CMakeLists.template
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
+set (  CMAKE_BUILD_TYPE "Debug" )
 set (  ADDR_CONF False )
 set (  BYTE_ORDER=LITTLE_ENDIAN )
 set (  DEBUG_OMG False )
@@ -35,7 +35,7 @@ set (  LOG_NO_THREAD False )
 set (  LOWLATENCY False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
-set (  MESSAGE_CHART_GENERATOR False)
+set (  MESSAGE_CHART_GENERATOR True)
 set (  MIH_C_MEDIEVAL_EXTENSIONS False )
 set (  MSG_PRINT False )
 set (  MU_RECEIVER False )
@@ -75,6 +75,7 @@ set (  RRC_ASN1_VERSION "Rel10" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_MSG_PRINT False )
 set (  RTAI False )
+set (  S1AP_DEBUG_LIST True )
 set (  SECU False )
 set (  SMBV False )
 set (  SPECTRA False )