diff --git a/doc/training-guides/operator-editing-code.xml b/doc/training-guides/common/editing-code.xml
similarity index 100%
rename from doc/training-guides/operator-editing-code.xml
rename to doc/training-guides/common/editing-code.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml b/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
index a786366b..d43c7dd6 100644
--- a/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
+++ b/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
@@ -10,35 +10,35 @@
   </section>
         <section xml:id="developer-getting-tools-and-accounts">
         <title>Getting the Tools and Accounts for Committing Code</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'getting-tools-and-accounts']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-fix-doc-bug">
         <title>Fix a Documentation Bug</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'fix-doc-bug']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-submit-doc-bug">
         <title>Submit a Documentation Bug</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'submit-doc-bug']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="developer-create-branch">
         <title>Create a Branch</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'create-branch']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="developer-add-training-content">
         <title>Optional: Add to the Training Guide Documentation</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'add-training-content']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
diff --git a/doc/training-guides/operator-guide/bk002-ch002-operator-getting-started-lab.xml b/doc/training-guides/operator-guide/bk002-ch002-operator-getting-started-lab.xml
index 918d6998..1783bc4f 100644
--- a/doc/training-guides/operator-guide/bk002-ch002-operator-getting-started-lab.xml
+++ b/doc/training-guides/operator-guide/bk002-ch002-operator-getting-started-lab.xml
@@ -10,35 +10,35 @@
   </section>
         <section xml:id="operator-getting-tools-and-accounts">
         <title>Getting the Tools and Accounts for Committing Code</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'getting-tools-and-accounts']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="operator-fix-doc-bug">
         <title>Fix a Documentation Bug</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'fix-doc-bug']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="operator-submit-doc-bug">
         <title>Submit a Documentation Bug</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'submit-doc-bug']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
     <section xml:id="operator-create-branch">
         <title>Create a Branch</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'create-branch']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
     </section>
         <section xml:id="operator-add-training-content">
         <title>Optional: Add to the Training Guide Documentation</title>
-        <xi:include href="./operator-editing-code.xml"
+        <xi:include href="../common/editing-code.xml"
         xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'add-training-content']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="../figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>