diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml
index c72d2ff051..cffba3388e 100644
--- a/doc/install-guide/section_cinder-controller.xml
+++ b/doc/install-guide/section_cinder-controller.xml
@@ -53,7 +53,7 @@ connection = mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceabl
     <step os="ubuntu;rhel;centos;fedora;opensuse;sles">
       <para>Create the database tables for the Block Storage
         service:</para>
-      <screen><prompt>#</prompt> <userinput>cinder-manage db sync</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "cinder-manage db sync" cinder</userinput></screen>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Create a <literal>cinder</literal> user.</para>
diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index 680158a326..3d4e0f5db5 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -125,7 +125,7 @@ IDENTIFIED BY '<replaceable>GLANCE_DBPASS</replaceable>';</userinput></screen>
     </step>
     <step os="ubuntu;rhel;centos;fedora;opensuse;sles">
       <para>Create the database tables for the Image Service:</para>
-      <screen><prompt>#</prompt> <userinput>glance-manage db_sync</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "glance-manage db_sync" glance</userinput></screen>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Create a <literal>glance</literal> user that the Image
diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index 579da677e0..3a6c29cc9c 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -64,7 +64,7 @@ IDENTIFIED BY '<replaceable>HEAT_DBPASS</replaceable>';</userinput></screen>
     </step>
     <step os="fedora;centos;rhel;ubuntu">
       <para>Create the heat service tables:</para>
-      <screen><prompt>#</prompt> <userinput>heat-manage db_sync</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "heat-manage db_sync" heat</userinput></screen>
       <note>
         <para>Ignore <errortext>DeprecationWarning</errortext>
           errors.</para>
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index 9a609da753..ba38ebe51e 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -61,9 +61,8 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
     </step>
     <step os="ubuntu;rhel;centos;fedora;opensuse;sles">
       <para>Create the database tables for the Identity Service:</para>
-      <screen><prompt>#</prompt> <userinput>keystone-manage db_sync</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "keystone-manage db_sync" keystone</userinput></screen>
     </step>
-
     <step os="debian">
       <para>Define an authorization token to use as a shared secret
         between the Identity Service and other OpenStack services.
diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml
index 889d69cd72..0bbcb64095 100644
--- a/doc/install-guide/section_nova-controller.xml
+++ b/doc/install-guide/section_nova-controller.xml
@@ -121,7 +121,7 @@ IDENTIFIED BY '<replaceable>NOVA_DBPASS</replaceable>';</userinput></screen>
     </step>
     <step os="ubuntu;rhel;centos;fedora;opensuse;sles">
       <para>Create the Compute service tables:</para>
-      <screen><prompt>#</prompt> <userinput>nova-manage db sync</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "nova-manage db sync" nova</userinput></screen>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Create a <literal>nova</literal> user that Compute uses to