diff --git a/lib/trento_web/controllers/cluster_controller.ex b/lib/trento_web/controllers/cluster_controller.ex
index 372d1edd82..faa584758b 100644
--- a/lib/trento_web/controllers/cluster_controller.ex
+++ b/lib/trento_web/controllers/cluster_controller.ex
@@ -17,7 +17,7 @@ defmodule TrentoWeb.ClusterController do
 
   operation :list,
     summary: "List Pacemaker Clusters",
-    tags: ["Landscape"],
+    tags: ["Target Infrastructure"],
     description: "List all the discovered Pacemaker Clusters on the target infrastructure",
     responses: [
       ok:
diff --git a/lib/trento_web/controllers/health_overview_controller.ex b/lib/trento_web/controllers/health_overview_controller.ex
index 53e2481eb8..1638394831 100644
--- a/lib/trento_web/controllers/health_overview_controller.ex
+++ b/lib/trento_web/controllers/health_overview_controller.ex
@@ -8,7 +8,7 @@ defmodule TrentoWeb.HealthOverviewController do
 
   operation(:overview,
     summary: "Health overview of the disovered SAP Systems",
-    tags: ["Landscape"],
+    tags: ["Target Infrastructure"],
     description:
       "Provide an aggregated overview of the health of the discovered SAP Systems (and their components) on the target infrastructure",
     responses: [
diff --git a/lib/trento_web/controllers/host_controller.ex b/lib/trento_web/controllers/host_controller.ex
index 4021245ea9..59aa88a947 100644
--- a/lib/trento_web/controllers/host_controller.ex
+++ b/lib/trento_web/controllers/host_controller.ex
@@ -10,7 +10,7 @@ defmodule TrentoWeb.HostController do
 
   use OpenApiSpex.ControllerSpecs
 
-  tags ["Landscape"]
+  tags ["Target Infrastructure"]
 
   operation :list,
     summary: "List hosts",
diff --git a/lib/trento_web/controllers/sap_system_controller.ex b/lib/trento_web/controllers/sap_system_controller.ex
index 008ae4c3ce..b42ee3ae20 100644
--- a/lib/trento_web/controllers/sap_system_controller.ex
+++ b/lib/trento_web/controllers/sap_system_controller.ex
@@ -7,7 +7,7 @@ defmodule TrentoWeb.SapSystemController do
 
   use OpenApiSpex.ControllerSpecs
 
-  tags ["Landscape"]
+  tags ["Target Infrastructure"]
 
   operation :list,
     summary: "List SAP Systems",
diff --git a/lib/trento_web/openapi/api_spec.ex b/lib/trento_web/openapi/api_spec.ex
index cee0c2b083..a28bb993fb 100644
--- a/lib/trento_web/openapi/api_spec.ex
+++ b/lib/trento_web/openapi/api_spec.ex
@@ -23,7 +23,7 @@ defmodule TrentoWeb.OpenApi.ApiSpec do
       paths: Paths.from_router(Router),
       tags: [
         %Tag{
-          name: "Landscape",
+          name: "Target Infrastructure",
           description: "Providing access to the discovered target infrastructure"
         },
         %Tag{