diff --git a/projects/aqlprofile/src/core/aql_profile.cpp b/projects/aqlprofile/src/core/aql_profile.cpp
index 97d2e26ee37..38bab36a4c7 100644
--- a/projects/aqlprofile/src/core/aql_profile.cpp
+++ b/projects/aqlprofile/src/core/aql_profile.cpp
@@ -42,7 +42,6 @@
 #include "core/commandbuffermgr.hpp"
 
 #define CONSTRUCTOR_API __attribute__((constructor))
-#define DESTRUCTOR_API __attribute__((destructor))
 #define ERR_CHECK(cond, err, msg) \
   {                               \
     if (cond) {                   \
@@ -157,12 +156,8 @@ hsa_status_t DefaultTracedataCallback(hsa_ven_amd_aqlprofile_info_type_t info_ty
   return status;
 }
 
-Logger::mutex_t Logger::mutex_;
-Logger* Logger::instance_ = NULL;
 bool Pm4Factory::concurrent_create_mode_ = false;
 bool Pm4Factory::spm_kfd_mode_ = false;
-Pm4Factory::mutex_t Pm4Factory::mutex_;
-Pm4Factory::instances_t* Pm4Factory::instances_ = NULL;
 bool read_api_enabled = true;
 
 CONSTRUCTOR_API void constructor() {
@@ -172,11 +167,6 @@ CONSTRUCTOR_API void constructor() {
   }
 }
 
-DESTRUCTOR_API void destructor() {
-  Logger::Destroy();
-  Pm4Factory::Destroy();
-}
-
 }  // namespace aql_profile
 
 extern "C" {
diff --git a/projects/aqlprofile/src/core/logger.h b/projects/aqlprofile/src/core/logger.h
index b2651dac3ad..dfcfc24d912 100644
--- a/projects/aqlprofile/src/core/logger.h
+++ b/projects/aqlprofile/src/core/logger.h
@@ -69,20 +69,13 @@ class Logger {
 
   static const std::string& LastMessage() {
     Logger& logger = Instance();
-    std::lock_guard<mutex_t> lck(mutex_);
+    std::lock_guard<mutex_t> lck(logger.mutex_);
     return logger.message_[GetTid()];
   }
 
   static Logger& Instance() {
-    std::lock_guard<mutex_t> lck(mutex_);
-    if (instance_ == NULL) instance_ = new Logger();
-    return *instance_;
-  }
-
-  static void Destroy() {
-    std::lock_guard<mutex_t> lck(mutex_);
-    if (instance_ != NULL) delete instance_;
-    instance_ = NULL;
+    static Logger instance;
+    return instance;
   }
 
  private:
@@ -143,8 +136,7 @@ class Logger {
   bool streaming_;
   bool messaging_;
 
-  static mutex_t mutex_;
-  static Logger* instance_;
+  mutex_t mutex_;
   std::map<uint32_t, std::string> message_;
 };
 
diff --git a/projects/aqlprofile/src/core/pm4_factory.h b/projects/aqlprofile/src/core/pm4_factory.h
index 386abe3495b..fea3c101ce3 100644
--- a/projects/aqlprofile/src/core/pm4_factory.h
+++ b/projects/aqlprofile/src/core/pm4_factory.h
@@ -30,6 +30,7 @@
 
 #include <climits>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
@@ -119,8 +120,6 @@ class Pm4Factory {
     // First check and save the mode
     return Create(profile->agent, CheckConcurrent(profile));
   }
-  // Destroy factory
-  static void Destroy();
 
   // Return gpu id
   gpu_id_t GetGpuId() const { return gpu_id_; }
@@ -230,6 +229,7 @@ class Pm4Factory {
         concurrent_mode_(concurrent_create_mode_),
         block_map_(map) {}
 
+  friend class std::default_delete<Pm4Factory>;
   virtual ~Pm4Factory() {
     delete cmd_builder_;
     delete pmc_builder_;
@@ -260,7 +260,7 @@ class Pm4Factory {
       return a.handle < b.handle;
     }
   };
-  typedef std::map<hsa_agent_t, Pm4Factory*, instances_fncomp_t> instances_t;
+  typedef std::map<hsa_agent_t, std::unique_ptr<Pm4Factory>, instances_fncomp_t> instances_t;
 
   // Create GFX9 generic factory
   static Pm4Factory* Gfx9Create(const AgentInfo* agent_info);
@@ -283,19 +283,27 @@ class Pm4Factory {
 
   static bool CheckConcurrent(const profile_t* profile);
 
-  // Mutex for inter thread synchronization for the instances create/destroy
-  static mutex_t mutex_;
-  // Factory instances container
-  static instances_t* instances_;
+  // This struct holds all the "global" state for the factory system
+  struct Manager {
+    // Mutex for inter thread synchronization for the instances create/destroy
+    mutex_t mutex_;
+    // Factory instances container
+    instances_t instances_;
+  };
+
+  static Manager& getManager() {
+    static Manager manager_instance;
+    return manager_instance;
+  }
+
   // Block info container
   const BlockInfoMap block_map_;
 };
 
 inline Pm4Factory* Pm4Factory::Create(const AgentInfo* agent_info, gpu_id_t gpu_id,
                                       bool concurrent) {
-  // Check if we have the instance already created
-  if (instances_ == NULL) instances_ = new instances_t;
-  const auto ret = instances_->insert({agent_info->dev_id, NULL});
+  auto& manager = getManager();
+  const auto ret = manager.instances_.insert({agent_info->dev_id, nullptr});
   instances_t::iterator it = ret.first;
 
   concurrent_create_mode_ = concurrent;
@@ -304,48 +312,51 @@ inline Pm4Factory* Pm4Factory::Create(const AgentInfo* agent_info, gpu_id_t gpu_
 
   // Create a factory implementation for the GPU id
   if (ret.second) {
+    Pm4Factory *impl = nullptr;
     switch (gpu_id) {
       // Create Gfx9 generic factory
       case GFX9_GPU_ID:
-        it->second = Gfx9Create(agent_info);
+        impl = Gfx9Create(agent_info);
         break;
       // Create Gfx10 generic factory
       case GFX10_GPU_ID:
-        it->second = Gfx10Create(agent_info);
+        impl = Gfx10Create(agent_info);
         break;
       // Create Gfx11 generic factory
       case GFX11_GPU_ID:
-        it->second = Gfx11Create(agent_info);
+        impl = Gfx11Create(agent_info);
         break;
       case GFX12_GPU_ID:
-        it->second = Gfx12Create(agent_info);
+        impl = Gfx12Create(agent_info);
         break;
       // Create MI100 generic factory
       case MI100_GPU_ID:
-        it->second = Mi100Create(agent_info);
+        impl = Mi100Create(agent_info);
         break;
       case MI200_GPU_ID:
-        it->second = Mi200Create(agent_info);
+        impl = Mi200Create(agent_info);
         break;
       case MI300_GPU_ID:
-        it->second = Mi300Create(agent_info);
+        impl = Mi300Create(agent_info);
         break;
       case MI350_GPU_ID:
-        it->second = Mi350Create(agent_info);
+        impl = Mi350Create(agent_info);
         break;
       default:
         throw aql_profile_exc_val<gpu_id_t>("GPU id error", gpu_id);
     }
+    it->second.reset(impl);
   }
 
   if (it->second == NULL) throw aql_profile_exc_msg("Pm4Factory::Create() failed");
   it->second->gpu_id_ = gpu_id;
-  return it->second;
+  return it->second.get();
 }
 
 // Create PM4 factory
 inline Pm4Factory* Pm4Factory::Create(const hsa_agent_t agent, bool concurrent) {
-  std::lock_guard<mutex_t> lck(mutex_);
+  auto& manager = getManager();
+  std::lock_guard<mutex_t> lck(manager.mutex_);
   const AgentInfo* agent_info = HsaRsrcFactory::Instance().GetAgentInfo(agent);
   // Get GPU id for a given agent
 
@@ -376,17 +387,6 @@ inline Pm4Factory* Pm4Factory::Create(aqlprofile_agent_handle_t agent_info, bool
   return Pm4Factory::Create(info, gpu_id, concurrent);
 }
 
-// Destroy PM4 factory
-inline void Pm4Factory::Destroy() {
-  std::lock_guard<mutex_t> lck(mutex_);
-
-  if (instances_ != NULL) {
-    for (auto& item : *instances_) delete item.second;
-    delete instances_;
-    instances_ = NULL;
-  }
-}
-
 // Check the setting of pmc profiling mode
 inline bool Pm4Factory::CheckConcurrent(const profile_t* profile) {
   for (const hsa_ven_amd_aqlprofile_parameter_t* p = profile->parameters;
diff --git a/projects/aqlprofile/src/core/tests/aql_profile_tests.cpp b/projects/aqlprofile/src/core/tests/aql_profile_tests.cpp
index ba932e64c46..818e68668da 100644
--- a/projects/aqlprofile/src/core/tests/aql_profile_tests.cpp
+++ b/projects/aqlprofile/src/core/tests/aql_profile_tests.cpp
@@ -38,8 +38,6 @@ using namespace testing;
 namespace aql_profile {
 bool Pm4Factory::concurrent_create_mode_ = false;
 bool Pm4Factory::spm_kfd_mode_ = false;
-Pm4Factory::mutex_t Pm4Factory::mutex_;
-Pm4Factory::instances_t* Pm4Factory::instances_ = nullptr;
 }
 
 // Mock classes to simulate Pm4Factory and related functionality