diff --git a/watcher/decision_engine/datasources/prometheus_base.py b/watcher/decision_engine/datasources/prometheus_base.py
index 4c39a6e45..b3b1f8786 100644
--- a/watcher/decision_engine/datasources/prometheus_base.py
+++ b/watcher/decision_engine/datasources/prometheus_base.py
@@ -156,7 +156,7 @@ class PrometheusBase(base.DataSourceBase):
             host: fqdn for (host, fqdn) in (
                 (fqdn.split('.')[0], fqdn)
                 for fqdn in self.prometheus_fqdn_labels
-                if '.' in fqdn
+                # if '.' in fqdn
             )
         }
         if not host_instance_map:
diff --git a/watcher/decision_engine/strategy/strategies/host_maintenance.py b/watcher/decision_engine/strategy/strategies/host_maintenance.py
index 44d3228b6..4b4a268b6 100644
--- a/watcher/decision_engine/strategy/strategies/host_maintenance.py
+++ b/watcher/decision_engine/strategy/strategies/host_maintenance.py
@@ -93,7 +93,7 @@ class HostMaintenance(base.HostMaintenanceBaseStrategy):
                         "description": "Describe reason for moving host"
                                        "into maintenance mode.",
                         "type": "string",
-                        "default": False,
+                        "default": 'watcher_maintaining',
                 },
                 "disable_live_migration": {
                     "description": "Disable live migration in maintenance. "