diff --git a/modules/administration-guide/nav.adoc b/modules/administration-guide/nav.adoc
index f86dcf5236..69db037f4f 100644
--- a/modules/administration-guide/nav.adoc
+++ b/modules/administration-guide/nav.adoc
@@ -1,6 +1,6 @@
 .Administration Guide
 
-* xref:che-architecture-overview.adoc[]
+* xref:architecture-overview.adoc[]
 ** xref:architecture-overview-with-che-server.adoc[]
 *** xref:server-components-with-che-server.adoc[]
 *** xref:che-workspaces-architecture-with-che-server.adoc[]
diff --git a/modules/administration-guide/pages/architecture-overview-with-che-server.adoc b/modules/administration-guide/pages/architecture-overview-with-che-server.adoc
index d75ce5cfa1..c48fbe5e4b 100644
--- a/modules/administration-guide/pages/architecture-overview-with-che-server.adoc
+++ b/modules/administration-guide/pages/architecture-overview-with-che-server.adoc
@@ -1,4 +1,4 @@
-[id="che-architecture-overview-with-che-server"]
+[id="architecture-overview-with-che-server"]
 // = Che architecture with Che server as workspace engine
 :navtitle: Che server based
 :keywords: administration-guide, che-architecture-overview
diff --git a/modules/administration-guide/pages/architecture-overview-with-devworkspace.adoc b/modules/administration-guide/pages/architecture-overview-with-devworkspace.adoc
index 1225376596..6dc042c8d6 100644
--- a/modules/administration-guide/pages/architecture-overview-with-devworkspace.adoc
+++ b/modules/administration-guide/pages/architecture-overview-with-devworkspace.adoc
@@ -1,7 +1,7 @@
-[id="che-architecture-overview-with-devworkspace"]
+[id="architecture-overview-with-devworkspace"]
 // = Che architecture with {devworkspace}
 :navtitle: {devworkspace} based
-:keywords: administration-guide, che-architecture-overview, devworkspace
+:keywords: administration-guide, architecture-overview, devworkspace
 :page-aliases: .:che-architecture-overview-with-devworkspace, .:high-level-che-architecture-with-devworkspace, overview:high-level-che-architecture-with-devworkspace, administration-guide:high-level-che-architecture-with-devworkspace
 
 include::partial$con_architecture-overview-with-devworkspace.adoc[]
diff --git a/modules/administration-guide/pages/architecture-overview.adoc b/modules/administration-guide/pages/architecture-overview.adoc
index 98a2638921..17dbae963b 100644
--- a/modules/administration-guide/pages/architecture-overview.adoc
+++ b/modules/administration-guide/pages/architecture-overview.adoc
@@ -1,7 +1,7 @@
-[id="che-architecture-overview"]
+[id="architecture-overview"]
 // = Che architecture overview
 :navtitle: Architecture overview
-:keywords: administration-guide, che-architecture-overview
+:keywords: administration-guide, architecture-overview
 :page-aliases: .:che-architecture-overview, .:high-level-che-architecture, overview:high-level-che-architecture, administration-guide:high-level-che-architecture, che-architecture-overview
 
 include::partial$con_architecture-overview.adoc[]
diff --git a/modules/administration-guide/partials/assembly_calculating-che-resource-requirements.adoc b/modules/administration-guide/partials/assembly_calculating-che-resource-requirements.adoc
index 6fdc6d9c9a..f4a18c36e2 100644
--- a/modules/administration-guide/partials/assembly_calculating-che-resource-requirements.adoc
+++ b/modules/administration-guide/partials/assembly_calculating-che-resource-requirements.adoc
@@ -18,7 +18,7 @@ include::partial$con_a-workspace-example.adoc[leveloffset=+1]
 
 .Additional resources
 
-* xref:che-architecture-overview.adoc[]
+* xref:architecture-overview.adoc[]
 ifeval::["{project-context}" == "che"]
 * link:https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[{kubernetes} compute resources management documentation]
 endif::[]