diff --git a/src/MeoAssistant/AbstractTask.h b/src/MeoAssistant/AbstractTask.h
index 5a88e44372..a8bf460538 100644
--- a/src/MeoAssistant/AbstractTask.h
+++ b/src/MeoAssistant/AbstractTask.h
@@ -41,7 +41,7 @@ namespace asst
 
         template<typename PluginType>
         std::shared_ptr<PluginType> register_plugin()
-        requires std::is_base_of_v<AbstractTaskPlugin, PluginType> // Plugin must inherit AbstractTaskPlugin
+        requires std::derived_from<PluginType, AbstractTaskPlugin> // Plugin must inherit AbstractTaskPlugin
         {
             auto plugin = std::make_shared<PluginType>(m_callback, m_callback_arg, m_task_chain);
             m_plugins.emplace(plugin);
diff --git a/src/MeoAssistant/AsstUtils.hpp b/src/MeoAssistant/AsstUtils.hpp
index 63946fd133..b3e304f6c6 100644
--- a/src/MeoAssistant/AsstUtils.hpp
+++ b/src/MeoAssistant/AsstUtils.hpp
@@ -47,8 +47,8 @@ namespace asst::utils
 
     template<typename map_t>
     inline std::string string_replace_all_batch(const std::string& src, const map_t& replace_pairs)
-    requires std::is_base_of_v<typename map_t::value_type::first_type, std::string>
-          && std::is_base_of_v<typename map_t::value_type::second_type, std::string>
+    requires std::derived_from<map_t::value_type::first_type, std::string>
+          && std::derived_from<map_t::value_type::second_type, std::string>
     {
         std::string str = src;
         for (const auto& [old_value, new_value] : replace_pairs) {
diff --git a/src/MeoAssistant/TaskData.h b/src/MeoAssistant/TaskData.h
index 08680ba742..4c27f07194 100644
--- a/src/MeoAssistant/TaskData.h
+++ b/src/MeoAssistant/TaskData.h
@@ -26,8 +26,8 @@ namespace asst
         const std::unordered_set<std::string>& get_templ_required() const noexcept;
 
         template<typename TargetTaskInfoType>
-        requires std::is_base_of_v<TaskInfo, TargetTaskInfoType>
-             && !std::is_same_v<TaskInfo, TargetTaskInfoType> // Parameter must be a TaskInfo
+        requires std::derived_from<TargetTaskInfoType, TaskInfo>
+             && !std::same_as<TargetTaskInfoType, TaskInfo> // Parameter must be a TaskInfo and not same as TaskInfo
         std::shared_ptr<TargetTaskInfoType> get(const std::string& name)
         {
             auto it = m_all_tasks_info.find(name);
@@ -39,7 +39,7 @@ namespace asst
         }
 
         template<typename TargetTaskInfoType = TaskInfo>
-        requires std::is_same_v<TaskInfo, TargetTaskInfoType> // Parameter must be a TaskInfo
+        requires std::same_as<TargetTaskInfoType, TaskInfo> // Parameter must be a TaskInfo
         std::shared_ptr<TargetTaskInfoType> get(const std::string& name)
         {
             auto it = m_all_tasks_info.find(name);