diff --git a/doc/admin-guide-cloud/pom.xml b/doc/admin-guide-cloud/pom.xml
index a469e0fb31..336f23e27e 100644
--- a/doc/admin-guide-cloud/pom.xml
+++ b/doc/admin-guide-cloud/pom.xml
@@ -68,7 +68,7 @@
                         bk-admin-guide-cloud.xml
                     </includes>
                     <canonicalUrlBase>http://docs.openstack.org/admin-guide-cloud/content/</canonicalUrlBase>
-                    <profileSecurity>reviewer</profileSecurity>
+                    <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                 </configuration>
             </plugin>
diff --git a/doc/config-reference/pom.xml b/doc/config-reference/pom.xml
index 8302e88c99..b04732ea79 100644
--- a/doc/config-reference/pom.xml
+++ b/doc/config-reference/pom.xml
@@ -87,7 +87,7 @@
                         bk-config-ref.xml
                     </includes>
                     <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/config-reference/content/</canonicalUrlBase>
-                    <profileSecurity>reviewer</profileSecurity>
+                    <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                 </configuration>
             </plugin>
diff --git a/doc/glossary/pom.xml b/doc/glossary/pom.xml
index 242f567c96..5e5f5c849e 100644
--- a/doc/glossary/pom.xml
+++ b/doc/glossary/pom.xml
@@ -63,7 +63,6 @@
             openstack-glossary.xml
           </includes>
           <canonicalUrlBase>http://docs.openstack.org/glossary/content/</canonicalUrlBase>
-          <profileSecurity>reviewer</profileSecurity>
           <branding>openstack</branding>
         </configuration>
       </plugin>
diff --git a/doc/high-availability-guide/pom.xml b/doc/high-availability-guide/pom.xml
index 4a860f45fc..9e32029f62 100644
--- a/doc/high-availability-guide/pom.xml
+++ b/doc/high-availability-guide/pom.xml
@@ -68,7 +68,7 @@
                         bk-ha-guide.xml
                     </includes>
                     <canonicalUrlBase>http://docs.openstack.org/high-availability-guide/content/</canonicalUrlBase>
-                    <profileSecurity>reviewer</profileSecurity>
+                    <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                 </configuration>
             </plugin>
diff --git a/doc/image-guide/pom.xml b/doc/image-guide/pom.xml
index cf2b050fb8..8ab459932a 100644
--- a/doc/image-guide/pom.xml
+++ b/doc/image-guide/pom.xml
@@ -70,7 +70,8 @@
                     <includes>
                         bk-imageguide.xml
                     </includes>
-                    <profileSecurity>reviewer</profileSecurity>
+                    <canonicalUrlBase>http://docs.openstack.org/image-guide/content/</canonicalUrlBase>
+                    <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                 </configuration>
             </plugin>
diff --git a/doc/install-guide/pom.xml b/doc/install-guide/pom.xml
index bb0cf9df0c..903017160f 100644
--- a/doc/install-guide/pom.xml
+++ b/doc/install-guide/pom.xml
@@ -92,7 +92,7 @@
                     <includes>
                         bk_openstackinstallguide.xml
                     </includes>
-                    <profileSecurity>reviewer</profileSecurity>
+                    <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/install-guide/install/${operating.system}/content/</canonicalUrlBase>
                     <branding>openstack</branding>
                     <profileOs>${profile.os}</profileOs>
                 </configuration>
diff --git a/doc/security-guide/pom.xml b/doc/security-guide/pom.xml
index 5a39deed35..3d69dbddc8 100644
--- a/doc/security-guide/pom.xml
+++ b/doc/security-guide/pom.xml
@@ -32,7 +32,6 @@
                         <configuration>
                             <includes>bk_openstack-sec-guide.xml</includes>
                             <sourceDirectory>.</sourceDirectory>
-                            <canonicalUrlBase>http://docs.openstack.org/security-guide/content/</canonicalUrlBase>
                             <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                             <webhelpDirname>security-guide</webhelpDirname>
                             <pdfFilenameBase>security-guide</pdfFilenameBase>
@@ -66,6 +65,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <canonicalUrlBase>http://docs.openstack.org/security-guide/content/</canonicalUrlBase>
                     <branding>openstack</branding>
                     <showXslMessages>true</showXslMessages>
                 </configuration>
diff --git a/doc/training-guides/pom.xml b/doc/training-guides/pom.xml
index ec47f61e11..8a9a9f900d 100644
--- a/doc/training-guides/pom.xml
+++ b/doc/training-guides/pom.xml
@@ -64,6 +64,8 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <canonicalUrlBase>http://docs.openstack.org/training-guides/content/</canonicalUrlBase>
+                    <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                     <showXslMessages>true</showXslMessages>
                 </configuration>
diff --git a/doc/user-guide-admin/pom.xml b/doc/user-guide-admin/pom.xml
index 089a808869..d330ad60c6 100644
--- a/doc/user-guide-admin/pom.xml
+++ b/doc/user-guide-admin/pom.xml
@@ -65,7 +65,6 @@
           <showXslMessages>true</showXslMessages>
           <sourceDirectory>.</sourceDirectory>
           <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
-          <security>external</security>
           <branding>openstack</branding>
           <enableDisqus>${comments.enabled}</enableDisqus>
           <disqusShortname>os-user-admin-guide</disqusShortname>
@@ -75,6 +74,8 @@
           <formalProcedures>0</formalProcedures>
           <sectionAutolabel>0</sectionAutolabel>
           <tocSectionDepth>1</tocSectionDepth>
+          <canonicalUrlBase>http://docs.openstack.org/user-guide-admin/content/</canonicalUrlBase>
+          <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
         </configuration>
       </plugin>
     </plugins>
diff --git a/doc/user-guide/pom.xml b/doc/user-guide/pom.xml
index 64b86e1730..7f5244ade8 100644
--- a/doc/user-guide/pom.xml
+++ b/doc/user-guide/pom.xml
@@ -65,13 +65,14 @@
           <showXslMessages>true</showXslMessages>
           <sourceDirectory>.</sourceDirectory>
           <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
-          <security>external</security>
           <branding>openstack</branding>
           <enableDisqus>${comments.enabled}</enableDisqus>
           <disqusShortname>os-user-guide</disqusShortname>
           <enableGoogleAnalytics>1</enableGoogleAnalytics>
           <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
           <suppressFooterNavigation>0</suppressFooterNavigation>
+          <canonicalUrlBase>http://docs.openstack.org/user-guide/content/</canonicalUrlBase>
+          <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
         </configuration>
       </plugin>
     </plugins>