diff --git a/modules/administration-guide/nav.adoc b/modules/administration-guide/nav.adoc
index b9443c0e284..9c808c9ac25 100644
--- a/modules/administration-guide/nav.adoc
+++ b/modules/administration-guide/nav.adoc
@@ -41,3 +41,7 @@
 ** xref:installing-image-puller-on-openshift-using-operatorhub.adoc[]
 ** xref:installing-image-puller-on-openshift-using-openshift-templates.adoc[]
 ** xref:installing-image-puller-on-kubernetes-using-helm.adoc[]
+
+* xref:managing-identities-and-authorizations.adoc[]
+** xref:configuring-openshift-oauth.adoc[]
+** xref:configuring-bitbucket-server-oauth1.adoc[]
\ No newline at end of file
diff --git a/modules/administration-guide/pages/configuring-bitbucket-server-oauth1.adoc b/modules/administration-guide/pages/configuring-bitbucket-server-oauth1.adoc
new file mode 100644
index 00000000000..f0f101a9510
--- /dev/null
+++ b/modules/administration-guide/pages/configuring-bitbucket-server-oauth1.adoc
@@ -0,0 +1,7 @@
+[id="configuring-bitbucket-server-oauth1"]
+// = Configuring Bitbucket Server OAuth1
+:navtitle: Configuring Bitbucket Server OAuth1
+:keywords: end-user-guide, configuring-bitbucket-server-oauth1
+:page-aliases: .:configuring-bitbucket-server-oauth1
+
+include::partial$proc_configuring-bitbucket-server-oauth1.adoc[]
diff --git a/modules/end-user-guide/pages/configuring-openshift-oauth.adoc b/modules/administration-guide/pages/configuring-openshift-oauth.adoc
similarity index 100%
rename from modules/end-user-guide/pages/configuring-openshift-oauth.adoc
rename to modules/administration-guide/pages/configuring-openshift-oauth.adoc
diff --git a/modules/administration-guide/pages/managing-identities-and-authorizations.adoc b/modules/administration-guide/pages/managing-identities-and-authorizations.adoc
new file mode 100644
index 00000000000..85347249397
--- /dev/null
+++ b/modules/administration-guide/pages/managing-identities-and-authorizations.adoc
@@ -0,0 +1,7 @@
+[id="managing-identities-and-authorizations"]
+// = Managing identities and authorizations
+:navtitle: Managing identities and authorizations
+:keywords: end-user-guide, managing-identities-and-authorizations
+:page-aliases: .:managing-identities-and-authorizations
+
+include::partial$assembly_managing-identities-and-authorizations.adoc[]
diff --git a/modules/administration-guide/partials/assembly_managing-identities-and-authorizations.adoc b/modules/administration-guide/partials/assembly_managing-identities-and-authorizations.adoc
new file mode 100644
index 00000000000..03db4ca676a
--- /dev/null
+++ b/modules/administration-guide/partials/assembly_managing-identities-and-authorizations.adoc
@@ -0,0 +1,14 @@
+
+
+:parent-context-of-configuring-oauth-authorization: {context}
+
+[id="managing-identities-and-authorizations_{context}"]
+= Managing identities and authorizations
+
+:context: managing-identities-and-authorizations
+
+This section describes different aspects of managing identities and authorizations of {prod}
+
+* xref:configuring-openshift-oauth.adoc[]
+
+:context: {parent-context-of-managing-identities-and-authorizations}
diff --git a/modules/administration-guide/partials/proc_configuring-bitbucket-server-oauth1.adoc b/modules/administration-guide/partials/proc_configuring-bitbucket-server-oauth1.adoc
new file mode 100644
index 00000000000..3e7671ed988
--- /dev/null
+++ b/modules/administration-guide/partials/proc_configuring-bitbucket-server-oauth1.adoc
@@ -0,0 +1,18 @@
+// Module included in the following assemblies:
+//
+// Configuring Bitbucket Server OAuth1
+
+[id="configuring-bitbucket-server-oauth1_{context}"]
+= Configuring Bitbucket Server OAuth1
+
+For users to interact with Bitbucket Server, they must first authenticate to the Bitbucket Server. OAuth1 is a process in which users prove themselves to a cluster through an API with obtained OAuth access tokens.
+
+
+.Prerequisites
+
+* The `oc` tool is available.
+
+
+.Procedure
+
+* Bitbucket Server OAuth1
diff --git a/modules/end-user-guide/partials/proc_configuring-openshift-oauth.adoc b/modules/administration-guide/partials/proc_configuring-openshift-oauth.adoc
similarity index 100%
rename from modules/end-user-guide/partials/proc_configuring-openshift-oauth.adoc
rename to modules/administration-guide/partials/proc_configuring-openshift-oauth.adoc
diff --git a/modules/end-user-guide/nav.adoc b/modules/end-user-guide/nav.adoc
index efb907a2a2d..a8236162cec 100644
--- a/modules/end-user-guide/nav.adoc
+++ b/modules/end-user-guide/nav.adoc
@@ -32,8 +32,6 @@
 **** xref:provisioning-jetbrains-activation-code-for-offline-use.adoc[]
 ** xref:adding-tools-to-che-after-creating-a-workspace.adoc[]
 ** xref:editing-a-devfile-and-plug-in-at-runtime.adoc[]
-* xref:configuring-oauth-authorization.adoc[]
-** xref:configuring-openshift-oauth.adoc[]
 * xref:using-artifact-repositories-in-a-restricted-environment.adoc[]
 ** xref:using-maven-artifact-repositories.adoc[]
 ** xref:using-gradle-artifact-repositories.adoc[]
diff --git a/modules/end-user-guide/pages/configuring-oauth-authorization.adoc b/modules/end-user-guide/pages/configuring-oauth-authorization.adoc
deleted file mode 100644
index a2b6ece359a..00000000000
--- a/modules/end-user-guide/pages/configuring-oauth-authorization.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-[id="configuring-oauth-authorization"]
-// = Configuring OAuth authorization
-:navtitle: Configuring OAuth authorization
-:keywords: end-user-guide, configuring-oauth-authorization
-:page-aliases: .:configuring-oauth-authorization
-
-include::partial$assembly_configuring-oauth-authorization.adoc[]
diff --git a/modules/end-user-guide/partials/assembly_configuring-oauth-authorization.adoc b/modules/end-user-guide/partials/assembly_configuring-oauth-authorization.adoc
deleted file mode 100644
index 890bfe830fe..00000000000
--- a/modules/end-user-guide/partials/assembly_configuring-oauth-authorization.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-:parent-context-of-configuring-oauth-authorization: {context}
-
-[id="configuring-oauth-authorization_{context}"]
-= Configuring OAuth authorization
-
-:context: configuring-oauth-authorization
-
-This section describes how to connect {prod} as an OAuth application to supported OAuth providers.
-
-* xref:configuring-openshift-oauth.adoc[]
-
-:context: {parent-context-of-configuring-oauth-authorization}