diff --git a/config_tempest/services/watcher.py b/config_tempest/services/watcher.py
new file mode 100644
index 00000000..cbf1d364
--- /dev/null
+++ b/config_tempest/services/watcher.py
@@ -0,0 +1,24 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from config_tempest.services.base import Service
+
+
+class WatcherService(Service):
+
+    @staticmethod
+    def get_service_type():
+        return ['infra-optim']
+
+    @staticmethod
+    def get_codename():
+        return 'watcher'
diff --git a/releasenotes/notes/discover-watcher-service-3f55d94f8c8778b0.yaml b/releasenotes/notes/discover-watcher-service-3f55d94f8c8778b0.yaml
new file mode 100644
index 00000000..9a0d89e5
--- /dev/null
+++ b/releasenotes/notes/discover-watcher-service-3f55d94f8c8778b0.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    discover-tempest-config can now discover Watcher service automatically,
+    and configures service_available/watcher based on that discovery result
+    so that it can enable/disable tests for Watcher based on deployment
+    status.