diff --git a/_topic_map.yml b/_topic_map.yml
index d72d920ac83e..c52bd594c9f4 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -57,6 +57,7 @@ Topics:
   Distros: openshift-enterprise,openshift-origin
 - Name: Operators in OpenShift Container Platform
   File: architecture-operators
+  Distros: openshift-enterprise,openshift-origin
 - Name: Available cluster customizations
   File: customizations
   Distros: openshift-enterprise,openshift-origin
@@ -65,7 +66,7 @@ Name: Administering a cluster
 Dir: administering_a_cluster
 Distros: openshift-dedicated
 Topics:
-- Name: The Dedicated admin role
+- Name: The dedicated-admin role
   File: dedicated-admin-role
 ---
 Name: Installing
@@ -121,7 +122,7 @@ Topics:
 ---
 Name: Authentication
 Dir: authentication
-Distros: openshift-enterprise,openshift-origin,openshift-dedicated
+Distros: openshift-enterprise,openshift-origin
 Topics:
 - Name: Understanding authentication
   File: understanding-authentication
@@ -260,6 +261,7 @@ Topics:
   File: architecture-component-imageregistry
 - Name: Image Registry Operator in Openshift Container Platform
   File: configuring-registry-operator
+  Distros: openshift-enterprise,openshift-origin
 - Name: Registry options
   File: registry-options
   Distros: openshift-enterprise,openshift-origin
diff --git a/administering_a_cluster/dedicated-admin-role.adoc b/administering_a_cluster/dedicated-admin-role.adoc
index cdf22788da2b..68560339e1c1 100644
--- a/administering_a_cluster/dedicated-admin-role.adoc
+++ b/administering_a_cluster/dedicated-admin-role.adoc
@@ -1,5 +1,5 @@
 [id="dedicated-administrator-role"]
-= The {product-title} admin role
+= The dedicated-admin role
 include::modules/common-attributes.adoc[]
 :context: dedicated-administrator
 toc::[]
diff --git a/modules/abstraction-layers.adoc b/modules/abstraction-layers.adoc
index 21a6d6f37e14..8139ea3c9976 100644
--- a/modules/abstraction-layers.adoc
+++ b/modules/abstraction-layers.adoc
@@ -17,7 +17,9 @@ cluster management and orchestrates containers on multiple hosts.
 - Team and user tracking for organizing a large developer organization
 - Networking infrastructure that supports the cluster
 
+ifdef::openshift-enterprise,openshift-origin[]
 .{product-title} Architecture Overview
 image::../images/architecture_overview.png[{product-title} Architecture Overview]
+endif::[]
 
 The cluster uses a combination of master and worker nodes.