diff --git a/lib/src/alertconfiguration.cc b/lib/src/alertconfiguration.cc
index 741128d..817c98f 100644
--- a/lib/src/alertconfiguration.cc
+++ b/lib/src/alertconfiguration.cc
@@ -207,14 +207,6 @@ int AlertConfiguration::addRule(std::istream& newRuleString, std::set<std::strin
         return -5;
     }
 
-    // PQSWMBT-3723, don't instanciate sensor temp./humidity rules directly
-    if ((temp_rule->name().find("humidity.default@sensor-") == 0) // starts with...
-        || (temp_rule->name().find("temperature.default@sensor-") == 0)) {
-        log_debug("rule instanciation rejected (%s)", temp_rule->name().c_str());
-        return -100;
-    }
-    // end PQSWMBT-3723
-
     // PQSWMBT-4921 Xphase rule exceptions (see templateruleconfigurator.cc)
     auto asset = temp_rule->name().substr(temp_rule->name().find("@") + 1);
     if (!ruleXphaseIsApplicable(temp_rule->name(), getAssetInfoFromAutoconfig(asset))) {
diff --git a/lib/src/fty_alert_engine_server.cc b/lib/src/fty_alert_engine_server.cc
index d4c9200..95a1030 100644
--- a/lib/src/fty_alert_engine_server.cc
+++ b/lib/src/fty_alert_engine_server.cc
@@ -276,19 +276,17 @@ static void list_rules2(mlm_client_t* client, const char* jsonFilters, AlertConf
             { "sts-voltage", { T_STS } },
             { "ambient.humidity", { T_HUMIDITY } },
             { "ambient.temperature", { T_TEMPERATURE } },
+            { "humidity.default", { T_HUMIDITY } },
+            { "temperature.default", { T_TEMPERATURE } },
         // enumerated rules (see RULES_1_N)
             { "outlet.group.1.current", { T_OUTPUT_CURRENT } },
             { "outlet.group.1.voltage", { T_OUTPUT_VOLTAGE } },
-            { "ambient.1.humidity", { T_HUMIDITY } },
-            { "ambient.1.temperature", { T_TEMPERATURE } },
         }; // CAT_TOKENS
 
         // enumerated rules redirections
         static const std::vector<std::pair<std::regex, std::string>> RULES_1_N = {
             { std::regex{R"(outlet\.group\.\d{1,4}\.current)"}, "outlet.group.1.current"},
             { std::regex{R"(outlet\.group\.\d{1,4}\.voltage)"}, "outlet.group.1.voltage"},
-            { std::regex{R"(ambient\.\d{1,4}\.humidity)"}, "ambient.1.humidity"},
-            { std::regex{R"(ambient\.\d{1,4}\.temperature)"}, "ambient.1.temperature"},
         };
 
         std::string ruleNamePrefix{ruleName};