diff --git a/admin_guide/_topic_map_compute_edition.yml b/admin_guide/_topic_map_compute_edition.yml
index 3adf97aa..b40a3edb 100644
--- a/admin_guide/_topic_map_compute_edition.yml
+++ b/admin_guide/_topic_map_compute_edition.yml
@@ -188,6 +188,34 @@ Topics:
 - Name: Credentials store
   File: credentials_store
 ---
+Name: Authentication
+Dir: authentication
+Topics:
+- Name: Authentication
+  File: authentication
+- Name: Integrate with Active Directory
+  File: integrate_active_directory
+- Name: Integrate with OpenLDAP
+  File: integrate_openldap
+- Name: Integrate with SAML
+  File: integrate_saml
+- Name: Integrate Google G Suite (SAML)
+  File: integrate_saml_google_g_suite
+- Name: Integrate with Azure Active Directory via SAML 2.0 Federation
+  File: integrate_saml_azure_active_directory
+- Name: Integrate with PingFederate via SAML 2.0 Federation
+  File: integrate_saml_ping_federate
+- Name: Integrate with Active Directory Federation Services (ADFS) via SAML 2.0 Federation
+  File: integrate_saml_active_directory_federation_services
+- Name: Active Directory Non-default UPN suffixes
+  File: non_default_upn_suffixes
+- Name: Compute user roles
+  File: user_roles
+- Name: Assign roles
+  File: assign_roles
+- Name: Use custom certificates for authorization
+  File: use_custom_certs_for_auth
+---
 Name: Vulnerability management
 Dir: vulnerability_management
 Topics:
@@ -251,38 +279,6 @@ Topics:
 - Name: PCF blobstore scanning
   File: pcf_blobstore
 ---
-Name: Access control
-Dir: access_control
-Topics:
-- Name: Access control
-  File: access_control
-- Name: Role-based access control
-  File: rbac
-- Name: Integrate with Active Directory
-  File: integrate_active_directory
-- Name: Integrate with OpenLDAP
-  File: integrate_openldap
-- Name: Integrate with SAML
-  File: integrate_saml
-- Name: Integrate Google G Suite (SAML)
-  File: integrate_saml_google_g_suite
-- Name: Integrate with Azure Active Directory via SAML 2.0 Federation
-  File: integrate_saml_azure_active_directory
-- Name: Integrate with PingFederate via SAML 2.0 Federation
-  File: integrate_saml_ping_federate
-- Name: Integrate with Active Directory Federation Services (ADFS) via SAML 2.0 Federation
-  File: integrate_saml_active_directory_federation_services
-- Name: Non-default UPN suffixes
-  File: non_default_upn_suffixes
-- Name: Compute user roles
-  File: user_roles
-- Name: Assign roles
-  File: assign_roles
-- Name: Use custom certificates for authorization
-  File: use_custom_certs_for_auth
-- Name: Open Policy Agent
-  File: open_policy_agent
----
 Name: Compliance
 Dir: compliance
 Topics:
@@ -372,6 +368,16 @@ Topics:
   - Name: Service violation
     File: service_violation
 ---
+Name: Access control
+Dir: access_control
+Topics:
+- Name: Access control
+  File: access_control
+- Name: Docker role-based access control
+  File: rbac
+- Name: Open Policy Agent
+  File: open_policy_agent
+---
 Name: Continuous integration
 Dir: continuous_integration
 Topics:
@@ -491,6 +497,28 @@ Topics:
 - Name: Kubernetes auditing
   File: kubernetes_auditing
 ---
+Name: Continuous integration
+Dir: continuous_integration
+Topics:
+- Name: Continuous integration
+  File: continuous_integration
+- Name: Jenkins plugin
+  File: jenkins_plugin
+- Name: Jenkins Freestyle project
+  File: jenkins_freestyle_project
+- Name: Jenkins Maven project
+  File: jenkins_maven_project
+- Name: Jenkins Pipeline project
+  File: jenkins_pipeline_project
+- Name: Run Jenkins in a container
+  File: run_jenkins_container
+- Name: Jenkins pipeline on K8S
+  File: jenkins_pipeline_k8s
+- Name: CloudBees Core pipeline on K8S
+  File: cloudbees_core_pipeline_k8s
+- Name: Set policy in the CI plugins
+  File: set_policy_ci_plugins
+---
 Name: Tools
 Dir: tools
 Topics:
diff --git a/admin_guide/_topic_map_prisma_cloud.yml b/admin_guide/_topic_map_prisma_cloud.yml
index 68d9bee9..2b573844 100644
--- a/admin_guide/_topic_map_prisma_cloud.yml
+++ b/admin_guide/_topic_map_prisma_cloud.yml
@@ -168,6 +168,20 @@ Topics:
 - Name: Credentials store
   File: credentials_store
 ---
+Name: Authentication
+Dir: authentication
+Topics:
+- Name: Authentication
+  File: authentication
+- Name: Access keys
+  File: access_keys
+- Name: Prisma Cloud user roles
+  File: prisma_cloud_user_roles
+- Name: Compute user roles
+  File: user_roles
+- Name: Assign roles
+  File: assign_roles
+---
 Name: Vulnerability management
 Dir: vulnerability_management
 Topics:
@@ -236,16 +250,8 @@ Dir: access_control
 Topics:
 - Name: Access control
   File: access_control
-- Name: Access keys
-  File: access_keys
-- Name: Role-based access control
+- Name: Docker role-based access control
   File: rbac
-- Name: Prisma Cloud user roles
-  File: prisma_cloud_user_roles
-- Name: Compute user roles
-  File: user_roles
-- Name: Assign roles
-  File: assign_roles
 - Name: Open Policy Agent
   File: open_policy_agent
 ---
diff --git a/admin_guide/access_control/.DS_Store b/admin_guide/access_control/.DS_Store
new file mode 100644
index 00000000..8d316635
Binary files /dev/null and b/admin_guide/access_control/.DS_Store differ
diff --git a/admin_guide/access_control/access_control.adoc b/admin_guide/access_control/access_control.adoc
index 58424eaf..c787cccc 100644
--- a/admin_guide/access_control/access_control.adoc
+++ b/admin_guide/access_control/access_control.adoc
@@ -1,10 +1,3 @@
 == Access control
 
 Establish and monitor access control measures for cloud workloads and cloud native applications.
-
-Prisma Cloud provides broad enterprise identity support, integrating with Active Directory, OpenLDAP, Ping, Okta, Shibboleth, Azure AD, and G Suite, allowing you to implement central credential management in the Prisma Cloud Platform.
-Define accounts and IAM roles to integrate with your cloud providers in one place and reuse them across the product.
-Pluggable cryptography allows you to bring your own certificates, not just for TLS, but also for smart card authentication to Console.
-
-Prisma Cloud ships with prebuilt roles to provide least privilege access to your devops and security teams.
-Use Assigned Collections to precisely control what data teams can view or use built-in multi-tenancy to securely isolate entire business units or geographies within the same Console.
diff --git a/admin_guide/authentication/.DS_Store b/admin_guide/authentication/.DS_Store
new file mode 100644
index 00000000..50c27e7d
Binary files /dev/null and b/admin_guide/authentication/.DS_Store differ
diff --git a/admin_guide/access_control/access_keys.adoc b/admin_guide/authentication/access_keys.adoc
similarity index 100%
rename from admin_guide/access_control/access_keys.adoc
rename to admin_guide/authentication/access_keys.adoc
diff --git a/admin_guide/access_control/assign_roles.adoc b/admin_guide/authentication/assign_roles.adoc
similarity index 97%
rename from admin_guide/access_control/assign_roles.adoc
rename to admin_guide/authentication/assign_roles.adoc
index 6137978a..569ac932 100644
--- a/admin_guide/access_control/assign_roles.adoc
+++ b/admin_guide/authentication/assign_roles.adoc
@@ -1,7 +1,7 @@
 == Assign roles
 
 ifdef::compute_edition[]
-After creating a user or group, you can assign a xref:../access_control/user_roles.adoc[role] to it.
+After creating a user or group, you can assign a xref:../user_roles.adoc[role] to it.
 Roles determine the level of access to Prisma Cloud’s data and settings.
 
 Prisma Cloud supports two types of users and groups:
@@ -9,7 +9,6 @@ Prisma Cloud supports two types of users and groups:
 * Centrally managed users and groups, defined in your organization’s directory service.
 With directory services such as Active Directory, OpenLDAP, and SAML providers, you can re-use the identities set up in these systems.
 * Prisma Cloud users and groups, created and managed from Console.
-
 For centrally managed users groups, roles can be assigned after you integrate your directory service with Prisma Cloud.
 Roles can be assigned to individual users or to groups.
 When you assign a role to a group, all members of the group inherit the role.
@@ -117,7 +116,6 @@ The following procedure shows you how to assign a role to an existing AD/OpenLDA
 *Prerequisites:*
 
 * You have integrated Prisma Cloud with Active Directory, OpenLDAP, or SAML.
-
 [.procedure]
 . Open Console, and log in with your admin credentials.
 
@@ -142,4 +140,4 @@ Access is denied to users with any other role.
 
 The Prisma Cloud System Admin role is mapped to Compute's (inner management interface) Administrator role.
 
-endif::prisma_cloud[]
+endif::prisma_cloud[]
\ No newline at end of file
diff --git a/admin_guide/authentication/authentication.adoc b/admin_guide/authentication/authentication.adoc
new file mode 100644
index 00000000..616ef3f7
--- /dev/null
+++ b/admin_guide/authentication/authentication.adoc
@@ -0,0 +1,8 @@
+== Authentication
+
+Prisma Cloud provides broad enterprise identity support, integrating with Active Directory, OpenLDAP, Ping, Okta, Shibboleth, Azure AD, and G Suite, allowing you to implement central credential management in the Prisma Cloud Platform.
+Define accounts and IAM roles to integrate with your cloud providers in one place and reuse them across the product.
+Pluggable cryptography allows you to bring your own certificates, not just for TLS, but also for smart card authentication to Console.
+
+Prisma Cloud ships with prebuilt roles to provide least privilege access to your devops and security teams.
+Use Assigned Collections to precisely control what data teams can view or use built-in multi-tenancy to securely isolate entire business units or geographies within the same Console.
diff --git a/admin_guide/authentication/images/.DS_Store b/admin_guide/authentication/images/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/admin_guide/authentication/images/.DS_Store differ
diff --git a/admin_guide/access_control/images/aad_saml_20180912_1.png b/admin_guide/authentication/images/aad_saml_20180912_1.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20180912_1.png
rename to admin_guide/authentication/images/aad_saml_20180912_1.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_1.png b/admin_guide/authentication/images/aad_saml_20200305_1.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_1.png
rename to admin_guide/authentication/images/aad_saml_20200305_1.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_10.png b/admin_guide/authentication/images/aad_saml_20200305_10.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_10.png
rename to admin_guide/authentication/images/aad_saml_20200305_10.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_11.png b/admin_guide/authentication/images/aad_saml_20200305_11.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_11.png
rename to admin_guide/authentication/images/aad_saml_20200305_11.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_12.png b/admin_guide/authentication/images/aad_saml_20200305_12.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_12.png
rename to admin_guide/authentication/images/aad_saml_20200305_12.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_2.png b/admin_guide/authentication/images/aad_saml_20200305_2.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_2.png
rename to admin_guide/authentication/images/aad_saml_20200305_2.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_3.png b/admin_guide/authentication/images/aad_saml_20200305_3.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_3.png
rename to admin_guide/authentication/images/aad_saml_20200305_3.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_4.png b/admin_guide/authentication/images/aad_saml_20200305_4.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_4.png
rename to admin_guide/authentication/images/aad_saml_20200305_4.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_5.png b/admin_guide/authentication/images/aad_saml_20200305_5.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_5.png
rename to admin_guide/authentication/images/aad_saml_20200305_5.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_6.png b/admin_guide/authentication/images/aad_saml_20200305_6.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_6.png
rename to admin_guide/authentication/images/aad_saml_20200305_6.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_7.png b/admin_guide/authentication/images/aad_saml_20200305_7.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_7.png
rename to admin_guide/authentication/images/aad_saml_20200305_7.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_8.png b/admin_guide/authentication/images/aad_saml_20200305_8.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_8.png
rename to admin_guide/authentication/images/aad_saml_20200305_8.png
diff --git a/admin_guide/access_control/images/aad_saml_20200305_9.png b/admin_guide/authentication/images/aad_saml_20200305_9.png
similarity index 100%
rename from admin_guide/access_control/images/aad_saml_20200305_9.png
rename to admin_guide/authentication/images/aad_saml_20200305_9.png
diff --git a/admin_guide/access_control/images/access_keys_list.png b/admin_guide/authentication/images/access_keys_list.png
similarity index 100%
rename from admin_guide/access_control/images/access_keys_list.png
rename to admin_guide/authentication/images/access_keys_list.png
diff --git a/admin_guide/access_control/images/access_keys_path_to_console.png b/admin_guide/authentication/images/access_keys_path_to_console.png
similarity index 100%
rename from admin_guide/access_control/images/access_keys_path_to_console.png
rename to admin_guide/authentication/images/access_keys_path_to_console.png
diff --git a/admin_guide/access_control/images/adfs_saml_1.png b/admin_guide/authentication/images/adfs_saml_1.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_1.png
rename to admin_guide/authentication/images/adfs_saml_1.png
diff --git a/admin_guide/access_control/images/adfs_saml_10.png b/admin_guide/authentication/images/adfs_saml_10.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_10.png
rename to admin_guide/authentication/images/adfs_saml_10.png
diff --git a/admin_guide/access_control/images/adfs_saml_11.png b/admin_guide/authentication/images/adfs_saml_11.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_11.png
rename to admin_guide/authentication/images/adfs_saml_11.png
diff --git a/admin_guide/access_control/images/adfs_saml_12.png b/admin_guide/authentication/images/adfs_saml_12.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_12.png
rename to admin_guide/authentication/images/adfs_saml_12.png
diff --git a/admin_guide/access_control/images/adfs_saml_13.png b/admin_guide/authentication/images/adfs_saml_13.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_13.png
rename to admin_guide/authentication/images/adfs_saml_13.png
diff --git a/admin_guide/access_control/images/adfs_saml_2.png b/admin_guide/authentication/images/adfs_saml_2.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_2.png
rename to admin_guide/authentication/images/adfs_saml_2.png
diff --git a/admin_guide/access_control/images/adfs_saml_3.png b/admin_guide/authentication/images/adfs_saml_3.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_3.png
rename to admin_guide/authentication/images/adfs_saml_3.png
diff --git a/admin_guide/access_control/images/adfs_saml_4.png b/admin_guide/authentication/images/adfs_saml_4.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_4.png
rename to admin_guide/authentication/images/adfs_saml_4.png
diff --git a/admin_guide/access_control/images/adfs_saml_5.png b/admin_guide/authentication/images/adfs_saml_5.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_5.png
rename to admin_guide/authentication/images/adfs_saml_5.png
diff --git a/admin_guide/access_control/images/adfs_saml_6.png b/admin_guide/authentication/images/adfs_saml_6.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_6.png
rename to admin_guide/authentication/images/adfs_saml_6.png
diff --git a/admin_guide/access_control/images/adfs_saml_7.png b/admin_guide/authentication/images/adfs_saml_7.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_7.png
rename to admin_guide/authentication/images/adfs_saml_7.png
diff --git a/admin_guide/access_control/images/adfs_saml_8.png b/admin_guide/authentication/images/adfs_saml_8.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_8.png
rename to admin_guide/authentication/images/adfs_saml_8.png
diff --git a/admin_guide/access_control/images/adfs_saml_9.png b/admin_guide/authentication/images/adfs_saml_9.png
similarity index 100%
rename from admin_guide/access_control/images/adfs_saml_9.png
rename to admin_guide/authentication/images/adfs_saml_9.png
diff --git a/admin_guide/access_control/images/integrate_active_directory_555634.png b/admin_guide/authentication/images/integrate_active_directory_555634.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_active_directory_555634.png
rename to admin_guide/authentication/images/integrate_active_directory_555634.png
diff --git a/admin_guide/access_control/images/integrate_active_directory_555634.png.1 b/admin_guide/authentication/images/integrate_active_directory_555634.png.1
similarity index 100%
rename from admin_guide/access_control/images/integrate_active_directory_555634.png.1
rename to admin_guide/authentication/images/integrate_active_directory_555634.png.1
diff --git a/admin_guide/access_control/images/integrate_active_directory_555634.png.2 b/admin_guide/authentication/images/integrate_active_directory_555634.png.2
similarity index 100%
rename from admin_guide/access_control/images/integrate_active_directory_555634.png.2
rename to admin_guide/authentication/images/integrate_active_directory_555634.png.2
diff --git a/admin_guide/access_control/images/integrate_g_suite_791235.png b/admin_guide/authentication/images/integrate_g_suite_791235.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791235.png
rename to admin_guide/authentication/images/integrate_g_suite_791235.png
diff --git a/admin_guide/access_control/images/integrate_g_suite_791236.png b/admin_guide/authentication/images/integrate_g_suite_791236.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791236.png
rename to admin_guide/authentication/images/integrate_g_suite_791236.png
diff --git a/admin_guide/access_control/images/integrate_g_suite_791240.png b/admin_guide/authentication/images/integrate_g_suite_791240.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791240.png
rename to admin_guide/authentication/images/integrate_g_suite_791240.png
diff --git a/admin_guide/access_control/images/integrate_g_suite_791241.png b/admin_guide/authentication/images/integrate_g_suite_791241.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791241.png
rename to admin_guide/authentication/images/integrate_g_suite_791241.png
diff --git a/admin_guide/access_control/images/integrate_g_suite_791242.png b/admin_guide/authentication/images/integrate_g_suite_791242.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791242.png
rename to admin_guide/authentication/images/integrate_g_suite_791242.png
diff --git a/admin_guide/access_control/images/integrate_g_suite_791271.png b/admin_guide/authentication/images/integrate_g_suite_791271.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_g_suite_791271.png
rename to admin_guide/authentication/images/integrate_g_suite_791271.png
diff --git a/admin_guide/access_control/images/integrate_saml_610130.png b/admin_guide/authentication/images/integrate_saml_610130.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610130.png
rename to admin_guide/authentication/images/integrate_saml_610130.png
diff --git a/admin_guide/access_control/images/integrate_saml_610131.png b/admin_guide/authentication/images/integrate_saml_610131.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610131.png
rename to admin_guide/authentication/images/integrate_saml_610131.png
diff --git a/admin_guide/access_control/images/integrate_saml_610135.png b/admin_guide/authentication/images/integrate_saml_610135.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610135.png
rename to admin_guide/authentication/images/integrate_saml_610135.png
diff --git a/admin_guide/access_control/images/integrate_saml_610136.png b/admin_guide/authentication/images/integrate_saml_610136.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610136.png
rename to admin_guide/authentication/images/integrate_saml_610136.png
diff --git a/admin_guide/access_control/images/integrate_saml_610140.png b/admin_guide/authentication/images/integrate_saml_610140.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610140.png
rename to admin_guide/authentication/images/integrate_saml_610140.png
diff --git a/admin_guide/access_control/images/integrate_saml_610146.png b/admin_guide/authentication/images/integrate_saml_610146.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610146.png
rename to admin_guide/authentication/images/integrate_saml_610146.png
diff --git a/admin_guide/access_control/images/integrate_saml_610150.png b/admin_guide/authentication/images/integrate_saml_610150.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610150.png
rename to admin_guide/authentication/images/integrate_saml_610150.png
diff --git a/admin_guide/access_control/images/integrate_saml_610156.png b/admin_guide/authentication/images/integrate_saml_610156.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610156.png
rename to admin_guide/authentication/images/integrate_saml_610156.png
diff --git a/admin_guide/access_control/images/integrate_saml_610160.png b/admin_guide/authentication/images/integrate_saml_610160.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610160.png
rename to admin_guide/authentication/images/integrate_saml_610160.png
diff --git a/admin_guide/access_control/images/integrate_saml_610163.png b/admin_guide/authentication/images/integrate_saml_610163.png
similarity index 100%
rename from admin_guide/access_control/images/integrate_saml_610163.png
rename to admin_guide/authentication/images/integrate_saml_610163.png
diff --git a/admin_guide/access_control/images/ldap_group.PNG b/admin_guide/authentication/images/ldap_group.PNG
similarity index 100%
rename from admin_guide/access_control/images/ldap_group.PNG
rename to admin_guide/authentication/images/ldap_group.PNG
diff --git a/admin_guide/access_control/images/ping_saml_step10.png b/admin_guide/authentication/images/ping_saml_step10.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step10.png
rename to admin_guide/authentication/images/ping_saml_step10.png
diff --git a/admin_guide/access_control/images/ping_saml_step11.png b/admin_guide/authentication/images/ping_saml_step11.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step11.png
rename to admin_guide/authentication/images/ping_saml_step11.png
diff --git a/admin_guide/access_control/images/ping_saml_step12.png b/admin_guide/authentication/images/ping_saml_step12.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step12.png
rename to admin_guide/authentication/images/ping_saml_step12.png
diff --git a/admin_guide/access_control/images/ping_saml_step13.png b/admin_guide/authentication/images/ping_saml_step13.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step13.png
rename to admin_guide/authentication/images/ping_saml_step13.png
diff --git a/admin_guide/access_control/images/ping_saml_step2.png b/admin_guide/authentication/images/ping_saml_step2.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step2.png
rename to admin_guide/authentication/images/ping_saml_step2.png
diff --git a/admin_guide/access_control/images/ping_saml_step3.png b/admin_guide/authentication/images/ping_saml_step3.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step3.png
rename to admin_guide/authentication/images/ping_saml_step3.png
diff --git a/admin_guide/access_control/images/ping_saml_step5.png b/admin_guide/authentication/images/ping_saml_step5.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step5.png
rename to admin_guide/authentication/images/ping_saml_step5.png
diff --git a/admin_guide/access_control/images/ping_saml_step6.png b/admin_guide/authentication/images/ping_saml_step6.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step6.png
rename to admin_guide/authentication/images/ping_saml_step6.png
diff --git a/admin_guide/access_control/images/ping_saml_step7.png b/admin_guide/authentication/images/ping_saml_step7.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step7.png
rename to admin_guide/authentication/images/ping_saml_step7.png
diff --git a/admin_guide/access_control/images/ping_saml_step8.png b/admin_guide/authentication/images/ping_saml_step8.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step8.png
rename to admin_guide/authentication/images/ping_saml_step8.png
diff --git a/admin_guide/access_control/images/ping_saml_step9.png b/admin_guide/authentication/images/ping_saml_step9.png
similarity index 100%
rename from admin_guide/access_control/images/ping_saml_step9.png
rename to admin_guide/authentication/images/ping_saml_step9.png
diff --git a/admin_guide/access_control/images/prisma_cloud_mgmt_interfaces.png b/admin_guide/authentication/images/prisma_cloud_mgmt_interfaces.png
similarity index 100%
rename from admin_guide/access_control/images/prisma_cloud_mgmt_interfaces.png
rename to admin_guide/authentication/images/prisma_cloud_mgmt_interfaces.png
diff --git a/admin_guide/access_control/images/prisma_cloud_role_mapping.png b/admin_guide/authentication/images/prisma_cloud_role_mapping.png
similarity index 100%
rename from admin_guide/access_control/images/prisma_cloud_role_mapping.png
rename to admin_guide/authentication/images/prisma_cloud_role_mapping.png
diff --git a/admin_guide/access_control/images/secrets_manager_790254.png b/admin_guide/authentication/images/secrets_manager_790254.png
similarity index 100%
rename from admin_guide/access_control/images/secrets_manager_790254.png
rename to admin_guide/authentication/images/secrets_manager_790254.png
diff --git a/admin_guide/access_control/images/secrets_manager_790256.png b/admin_guide/authentication/images/secrets_manager_790256.png
similarity index 100%
rename from admin_guide/access_control/images/secrets_manager_790256.png
rename to admin_guide/authentication/images/secrets_manager_790256.png
diff --git a/admin_guide/access_control/images/secrets_manager_791688.png b/admin_guide/authentication/images/secrets_manager_791688.png
similarity index 100%
rename from admin_guide/access_control/images/secrets_manager_791688.png
rename to admin_guide/authentication/images/secrets_manager_791688.png
diff --git a/admin_guide/access_control/images/use_custom_certs_auth_793632.png b/admin_guide/authentication/images/use_custom_certs_auth_793632.png
similarity index 100%
rename from admin_guide/access_control/images/use_custom_certs_auth_793632.png
rename to admin_guide/authentication/images/use_custom_certs_auth_793632.png
diff --git a/admin_guide/access_control/images/use_custom_certs_auth_795121.png b/admin_guide/authentication/images/use_custom_certs_auth_795121.png
similarity index 100%
rename from admin_guide/access_control/images/use_custom_certs_auth_795121.png
rename to admin_guide/authentication/images/use_custom_certs_auth_795121.png
diff --git a/admin_guide/access_control/images/use_custom_certs_auth_795123.png b/admin_guide/authentication/images/use_custom_certs_auth_795123.png
similarity index 100%
rename from admin_guide/access_control/images/use_custom_certs_auth_795123.png
rename to admin_guide/authentication/images/use_custom_certs_auth_795123.png
diff --git a/admin_guide/access_control/images/use_custom_certs_auth_banner.png b/admin_guide/authentication/images/use_custom_certs_auth_banner.png
similarity index 100%
rename from admin_guide/access_control/images/use_custom_certs_auth_banner.png
rename to admin_guide/authentication/images/use_custom_certs_auth_banner.png
diff --git a/admin_guide/access_control/images/user_roles_admin.png b/admin_guide/authentication/images/user_roles_admin.png
similarity index 100%
rename from admin_guide/access_control/images/user_roles_admin.png
rename to admin_guide/authentication/images/user_roles_admin.png
diff --git a/admin_guide/access_control/images/user_roles_user.png b/admin_guide/authentication/images/user_roles_user.png
similarity index 100%
rename from admin_guide/access_control/images/user_roles_user.png
rename to admin_guide/authentication/images/user_roles_user.png
diff --git a/admin_guide/access_control/integrate_active_directory.adoc b/admin_guide/authentication/integrate_active_directory.adoc
similarity index 96%
rename from admin_guide/access_control/integrate_active_directory.adoc
rename to admin_guide/authentication/integrate_active_directory.adoc
index fa70662e..01ea9de4 100644
--- a/admin_guide/access_control/integrate_active_directory.adoc
+++ b/admin_guide/authentication/integrate_active_directory.adoc
@@ -15,7 +15,7 @@ With AD integration, you can:
 * Extend your organization’s access control logic to the management of Docker containers.
 
 For example, you could specify that only members of the AD group Dev Ops Admins can start and stop containers in the production environment.
-For more information, see xref:../access_control/rbac.adoc[Access control for Docker Engine (RBAC)].
+For more information, see xref:../user_roles.adoc[User Roles].
 
 
 === Configuration options
@@ -155,7 +155,7 @@ After integrating AD with Prisma Cloud, you can:
 
 * Grant admin privileges to specific users or groups.
 For more information, see
-xref:../access_control/assign_roles.adoc[Assigning roles].
+xref:../assign_roles.adoc[Assigning roles].
 * Set up policies for accessing Docker and Kubernetes.
 For more information, see
 xref:../access_control/rbac.adoc[Access control for Docker Engine].
diff --git a/admin_guide/access_control/integrate_openldap.adoc b/admin_guide/authentication/integrate_openldap.adoc
similarity index 100%
rename from admin_guide/access_control/integrate_openldap.adoc
rename to admin_guide/authentication/integrate_openldap.adoc
diff --git a/admin_guide/access_control/integrate_saml.adoc b/admin_guide/authentication/integrate_saml.adoc
similarity index 100%
rename from admin_guide/access_control/integrate_saml.adoc
rename to admin_guide/authentication/integrate_saml.adoc
diff --git a/admin_guide/access_control/integrate_saml_active_directory_federation_services.adoc b/admin_guide/authentication/integrate_saml_active_directory_federation_services.adoc
similarity index 99%
rename from admin_guide/access_control/integrate_saml_active_directory_federation_services.adoc
rename to admin_guide/authentication/integrate_saml_active_directory_federation_services.adoc
index ed8fdfb2..4368398d 100644
--- a/admin_guide/access_control/integrate_saml_active_directory_federation_services.adoc
+++ b/admin_guide/authentication/integrate_saml_active_directory_federation_services.adoc
@@ -179,7 +179,7 @@ NOTE: When federating with ADFS Prisma Cloud usernames are case insensitive. All
 +
 image::adfs_saml_12.png[width=600]
 
-.. *Role*: select an appropriate xref:../access_control/user_roles.adoc#[role].
+.. *Role*: select an appropriate xref:../user_roles.adoc#[role].
 
 . Click *Save*.
 
diff --git a/admin_guide/access_control/integrate_saml_azure_active_directory.adoc b/admin_guide/authentication/integrate_saml_azure_active_directory.adoc
similarity index 100%
rename from admin_guide/access_control/integrate_saml_azure_active_directory.adoc
rename to admin_guide/authentication/integrate_saml_azure_active_directory.adoc
diff --git a/admin_guide/access_control/integrate_saml_google_g_suite.adoc b/admin_guide/authentication/integrate_saml_google_g_suite.adoc
similarity index 100%
rename from admin_guide/access_control/integrate_saml_google_g_suite.adoc
rename to admin_guide/authentication/integrate_saml_google_g_suite.adoc
diff --git a/admin_guide/access_control/integrate_saml_ping_federate.adoc b/admin_guide/authentication/integrate_saml_ping_federate.adoc
similarity index 100%
rename from admin_guide/access_control/integrate_saml_ping_federate.adoc
rename to admin_guide/authentication/integrate_saml_ping_federate.adoc
diff --git a/admin_guide/access_control/non_default_upn_suffixes.adoc b/admin_guide/authentication/non_default_upn_suffixes.adoc
similarity index 100%
rename from admin_guide/access_control/non_default_upn_suffixes.adoc
rename to admin_guide/authentication/non_default_upn_suffixes.adoc
diff --git a/admin_guide/access_control/prisma_cloud_user_roles.adoc b/admin_guide/authentication/prisma_cloud_user_roles.adoc
similarity index 97%
rename from admin_guide/access_control/prisma_cloud_user_roles.adoc
rename to admin_guide/authentication/prisma_cloud_user_roles.adoc
index f65acb7e..bd45a2e6 100644
--- a/admin_guide/access_control/prisma_cloud_user_roles.adoc
+++ b/admin_guide/authentication/prisma_cloud_user_roles.adoc
@@ -70,4 +70,4 @@ NOTE: Only Admin can create collections in Compute. Collections for Read-Only us
 
 To learn more about Prisma Cloud permission groups and roles, see https://docs.paloaltonetworks.com/prisma/prisma-cloud/prisma-cloud-admin/manage-prisma-cloud-administrators/create-prisma-cloud-roles.html#[Create Roles in Prisma Cloud].
 
-To learn more about Compute roles, see xref:../access_control/user_roles.adoc#[User roles].
+To learn more about Compute roles, see xref:../user_roles.adoc#[User roles].
diff --git a/admin_guide/access_control/use_custom_certs_for_auth.adoc b/admin_guide/authentication/use_custom_certs_for_auth.adoc
similarity index 100%
rename from admin_guide/access_control/use_custom_certs_for_auth.adoc
rename to admin_guide/authentication/use_custom_certs_for_auth.adoc
diff --git a/admin_guide/access_control/user_roles.adoc b/admin_guide/authentication/user_roles.adoc
similarity index 99%
rename from admin_guide/access_control/user_roles.adoc
rename to admin_guide/authentication/user_roles.adoc
index dd633be4..dba2bb72 100644
--- a/admin_guide/access_control/user_roles.adoc
+++ b/admin_guide/authentication/user_roles.adoc
@@ -75,7 +75,7 @@ In Console, you assign the Administrator role to GroupA and the Auditor role to
 NOTE: Roles are enforced the same way for both the Prisma Cloud UI and the Prisma Cloud API.
 
 To learn how to assign roles to users and groups, see
-xref:../access_control/assign_roles.adoc#[Assigning roles].
+xref:../assign_roles.adoc#[Assigning roles].
 
 
 === Roles
diff --git a/admin_guide/continuous_integration/containerized_mode.adoc b/admin_guide/continuous_integration/containerized_mode.adoc
deleted file mode 100644
index 387f76fb..00000000
--- a/admin_guide/continuous_integration/containerized_mode.adoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[NOTE]
-====
-You can run the Prisma Cloud scanner inside a container using the 'containerized' flag.
-Scanning from inside a container is only required for special situations.
-
-[source]
-----
-stage(‘Parallel’) {
-  agent {
-    docker {
-      image ‘ubuntu:latest’
-    }
-  }
-  stages {
-    stage(‘Prisma Cloud Scan’) {
-      steps {
-        prismaCloudScanImage ca: '', cert: '', containerized:true, ...
-      }
-    }    
-    ...
-}
-----
-
-When using the containerized mode, image ID won't be displayed in the scan results (only image name).
-====
diff --git a/admin_guide/continuous_integration/jenkins_pipeline_k8s.adoc b/admin_guide/continuous_integration/jenkins_pipeline_k8s.adoc
index 609a1810..1f4f84d1 100644
--- a/admin_guide/continuous_integration/jenkins_pipeline_k8s.adoc
+++ b/admin_guide/continuous_integration/jenkins_pipeline_k8s.adoc
@@ -167,5 +167,28 @@ Alternatively, we could use a https://github.com/nathanielc/docker-client[contai
 
 * *6* -- The second stage runs the Prisma Cloud scanner on the nginx image in the default jnlp container.
 
-// Reusable content fragment.
-include::containerized_mode.adoc[leveloffset=0]
+[NOTE]
+====
+You can run the Prisma Cloud scanner inside a container using the 'containerized' flag.
+Scanning from inside a container is only required for special situations.
+
+[source]
+----
+stage(‘Parallel’) {
+  agent {
+    docker {
+      image ‘ubuntu:latest’
+    }
+  }
+  stages {
+    stage(‘Prisma Cloud Scan’) {
+      steps {
+        prismaCloudScanImage ca: '', cert: '', containerized:true, ...
+      }
+    }
+    ...
+}
+----
+
+When using the containerized mode, image ID won't be displayed in the scan results (only image name).
+====
diff --git a/admin_guide/install/install_defender/images/lambda_env_varialbles.png b/admin_guide/install/install_defender/images/lambda_env_variables.png
similarity index 100%
rename from admin_guide/install/install_defender/images/lambda_env_varialbles.png
rename to admin_guide/install/install_defender/images/lambda_env_variables.png
diff --git a/build_site.sh b/build_site.sh
index 45a855a9..0e07a366 100755
--- a/build_site.sh
+++ b/build_site.sh
@@ -119,6 +119,9 @@ git commit -q -m "Commit index file for SaaS book"
 # Create a branch
 git checkout -b pcee
 
+# Rename topic map file.
+mv "$output_dir""/_topic_map_prisma_cloud.yml" "$output_dir""/_topic_map.yml"
+
 # Commit files.
 echo "Commit SaaS files"
 git add -A