diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e6d2f9..f6db919 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ option(MEMORY_LOCK "Memory Lock" OFF)
 option(MIC_TAP "Enable MIC_TAP" OFF)
 option(RF4CE_ENABLED "Enable RF4CE" ON)
 option(TELEMETRY_SUPPORT "Enable TELEMETRY_SUPPORT" OFF)
-option(THUNDER "Enable THUNDER" OFF)
+option(THUNDER "Enable THUNDER" ON)
 option(THUNDER_SECURITY "Enable THUNDER_SECURITY" OFF)
 option(USE_SAFEC "Use safec" OFF)
 option(USE_IARM_POWER_MANAGER "Use IARM Power Manager" OFF)
@@ -80,7 +80,7 @@ set(BEEP_ON_KWD_FILE "NONE" CACHE STRING "Keyword Beep file name")
 set(CMAKE_ENABLE_EXPORTS ON)
 
 # EXECUTABLE(S)
-add_executable(controlMgr src/ctrlm_config_default.json ctrlm_version_build.h ctrlm_config_default.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ctrlm_config_default.c ${CMAKE_CURRENT_SOURCE_DIR}/src/voice/ipc/ctrlm_voice_ipc_request_type.c)
+add_executable(controlMgr src/ctrlm_config_default.json ctrlm_version_build.h ctrlm_config_default.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ctrlm_config_default.c)
 
 if(BUILD_CTRLM_FACTORY)
     add_library(ctrlm-fta)
@@ -195,20 +195,6 @@ if(ASSERT_ON_WRONG_THREAD)
    add_compile_definitions(ASSERT_ON_WRONG_THREAD)
 endif()
 
-if(AUTH_ENABLED)
-   add_compile_definitions(AUTH_ENABLED)
-   add_compile_definitions(AUTH_ACCOUNT_ID)
-   add_compile_definitions(AUTH_DEVICE_ID)
-   add_compile_definitions(AUTH_PARTNER_ID)
-   add_compile_definitions(AUTH_SAT_TOKEN)
-   if(AUTH_ACTIVATION_STATUS)
-      add_compile_definitions(AUTH_ACTIVATION_STATUS)
-   endif()
-   #By default disabled but can be enabled
-   #add_compile_definitions(AUTH_EXPERIENCE)
-   target_link_libraries(controlMgr RdkCertSelector)
-endif()
-
 if(BLE_ENABLED)
    target_link_libraries(controlMgr BTMgr)
    if(BLE_SERVICES)
@@ -246,10 +232,6 @@ if(IP_ENABLED)
    add_compile_definitions(CTRLM_NETWORK_IP CTRLM_IP_HAL_LOG_ENABLED)
 endif()
 
-if(THUNDER)
-   add_compile_definitions(CTRLM_THUNDER)
-endif()
-
 if(LOCAL_MIC)
    add_compile_definitions(CTRLM_LOCAL_MIC)
    if(MIC_TAP)
@@ -289,11 +271,23 @@ if(THUNDER)
    if(WPE_FRAMEWORK_PROTO_TRACING)
       target_link_libraries(controlMgr WPEFrameworkProtocols WPEFrameworkTracing)
    endif()
-endif()
-
-if(THUNDER_SECURITY)
-   add_compile_definitions(THUNDER_SECURITY)
-   target_link_libraries(controlMgr WPEFrameworkSecurityUtil)
+   if(THUNDER_SECURITY)
+      add_compile_definitions(THUNDER_SECURITY)
+      target_link_libraries(controlMgr WPEFrameworkSecurityUtil)
+   endif()
+   if(AUTH_ENABLED)
+      add_compile_definitions(AUTH_ENABLED)
+      add_compile_definitions(AUTH_ACCOUNT_ID)
+      add_compile_definitions(AUTH_DEVICE_ID)
+      add_compile_definitions(AUTH_PARTNER_ID)
+      add_compile_definitions(AUTH_SAT_TOKEN)
+      if(AUTH_ACTIVATION_STATUS)
+         add_compile_definitions(AUTH_ACTIVATION_STATUS)
+      endif()
+      #By default disabled but can be enabled
+      #add_compile_definitions(AUTH_EXPERIENCE)
+      target_link_libraries(controlMgr RdkCertSelector)
+   endif()
 endif()
 
 if(USE_IARM_POWER_MANAGER)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ce881f..ab20447 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,6 @@ target_sources(controlMgr PRIVATE
    voice/endpoints/ctrlm_voice_endpoint_ws_nsp.cpp
    voice/ipc/ctrlm_voice_ipc_iarm_all.cpp
    voice/ipc/ctrlm_voice_ipc_iarm_legacy.cpp
-   voice/ipc/ctrlm_voice_ipc_request_type.c
    )
 
 if(BLE_ENABLED)
@@ -199,6 +198,7 @@ if(THUNDER)
       thunder/plugins/ctrlm_thunder_plugin_system.cpp
       ipc/ctrlm_rcp_ipc_iarm_thunder.cpp
       voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp
+      voice/ipc/ctrlm_voice_ipc_request_type.c
    )
 
    if(AUTH_ENABLED)
diff --git a/src/ctrlm_main.cpp b/src/ctrlm_main.cpp
index 7182839..7f72c2e 100644
--- a/src/ctrlm_main.cpp
+++ b/src/ctrlm_main.cpp
@@ -807,10 +807,12 @@ int main(int argc, char *argv[]) {
    g_ctrlm.ir_controller->db_load();
    g_ctrlm.ir_controller->print_status();
 
+   #ifdef CTRLM_THUNDER
    ctrlm_rcp_ipc_iarm_thunder_t *rcp_ipc = ctrlm_rcp_ipc_iarm_thunder_t::get_instance();
    if (rcp_ipc) {
        rcp_ipc->register_ipc();
    }
+   #endif
 
    XLOGD_INFO("init voice");
    g_ctrlm.voice_session->voice_configure_config_file_json(json_obj_voice, json_obj_vsdk, g_ctrlm.local_conf );
diff --git a/src/ctrlm_network.cpp b/src/ctrlm_network.cpp
index 31d04b7..74ff412 100644
--- a/src/ctrlm_network.cpp
+++ b/src/ctrlm_network.cpp
@@ -113,12 +113,14 @@ ctrlm_obj_network_t::~ctrlm_obj_network_t() {
       }
    }
 
+   #ifdef CTRLM_THUNDER
    ctrlm_rcp_ipc_iarm_thunder_t *rcp_ipc = ctrlm_rcp_ipc_iarm_thunder_t::get_instance();
    if (rcp_ipc) {
        rcp_ipc->deregister_ipc();
    }
    // No need to also destroy rcp_ipc instance here because its a singleton and will get 
    // automatically destroyed at ctrlm-main shutdown.
+   #endif
 }
 
 ctrlm_network_id_t ctrlm_obj_network_t::network_id_get() const {
@@ -1020,6 +1022,7 @@ ctrlm_rf_pair_state_t ctrlm_obj_network_t::get_rf_pair_state() const {
 void ctrlm_obj_network_t::iarm_event_rcu_status(void) {
    XLOGD_DEBUG("Enter...");
 
+   #ifdef CTRLM_THUNDER
    ctrlm_rcp_ipc_net_status_t msg;
    msg.populate_status(*this);
 
@@ -1030,11 +1033,13 @@ void ctrlm_obj_network_t::iarm_event_rcu_status(void) {
    if (!rcp_ipc->on_status(msg)) {
        XLOGD_ERROR("Error broadcasting IARM message");
    }
+   #endif
 }
 
 void ctrlm_obj_network_t::iarm_event_rcu_validation_status(void) {
    XLOGD_DEBUG("Enter...");
 
+   #ifdef CTRLM_THUNDER
    ctrlm_rcp_ipc_validation_status_t msg;
    msg.populate_status(*this);
 
@@ -1045,10 +1050,13 @@ void ctrlm_obj_network_t::iarm_event_rcu_validation_status(void) {
    if (!rcp_ipc->on_validation_status(msg)) {
        XLOGD_ERROR("Error broadcasting IARM message");
    }
+   #endif
 }
 
 void ctrlm_obj_network_t::iarm_event_rcu_firmware_status(const ctrlm_obj_controller_t &rcu) {
    XLOGD_DEBUG("Enter...");
+
+   #ifdef CTRLM_THUNDER
    ctrlm_rcp_ipc_iarm_thunder_t *rcp_ipc = ctrlm_rcp_ipc_iarm_thunder_t::get_instance();
 
    if (!rcp_ipc->is_thunder_device_update_enabled()) {
@@ -1064,4 +1072,5 @@ void ctrlm_obj_network_t::iarm_event_rcu_firmware_status(const ctrlm_obj_control
    if (!rcp_ipc->on_firmware_update_progress(msg)) {
        XLOGD_ERROR("Error broadcasting IARM message");
    }
+   #endif
 }
diff --git a/src/voice/ipc/ctrlm_voice_ipc_iarm_all.cpp b/src/voice/ipc/ctrlm_voice_ipc_iarm_all.cpp
index 561c0ab..fc90e06 100644
--- a/src/voice/ipc/ctrlm_voice_ipc_iarm_all.cpp
+++ b/src/voice/ipc/ctrlm_voice_ipc_iarm_all.cpp
@@ -24,7 +24,9 @@
 #include "jansson.h"
 
 ctrlm_voice_ipc_iarm_all_t::ctrlm_voice_ipc_iarm_all_t(ctrlm_voice_t *obj_voice): ctrlm_voice_ipc_t(obj_voice) {
+    #ifdef CTRLM_THUNDER
     this->ipc.push_back(new ctrlm_voice_ipc_iarm_thunder_t(obj_voice));
+    #endif
     this->ipc.push_back(new ctrlm_voice_ipc_iarm_legacy_t(obj_voice));
 }