diff --git a/doc/arch-design/compute_focus/section_prescriptive_examples_compute_focus.xml b/doc/arch-design/compute_focus/section_prescriptive_examples_compute_focus.xml
index 8142c337c2..17816aff94 100644
--- a/doc/arch-design/compute_focus/section_prescriptive_examples_compute_focus.xml
+++ b/doc/arch-design/compute_focus/section_prescriptive_examples_compute_focus.xml
@@ -43,7 +43,7 @@
         latter case.</para>
     <mediaobject>
         <imageobject>
-            <imagedata fileref="../images/Generic_CERN_Example.png"/>
+            <imagedata contentwidth="6in" fileref="../images/Generic_CERN_Example.png"/>
         </imageobject>
     </mediaobject>
     <para>There is also some customization of the filter scheduler
@@ -103,7 +103,7 @@
         also be configured in the child cells.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Generic_CERN_Architecture.png"/>
         </imageobject>
     </mediaobject>
diff --git a/doc/arch-design/generalpurpose/section_prescriptive_example_general_purpose.xml b/doc/arch-design/generalpurpose/section_prescriptive_example_general_purpose.xml
index 794fe04f3a..340ab484a9 100644
--- a/doc/arch-design/generalpurpose/section_prescriptive_example_general_purpose.xml
+++ b/doc/arch-design/generalpurpose/section_prescriptive_example_general_purpose.xml
@@ -57,9 +57,10 @@
                 such as images.</para>
         </listitem>
     </itemizedlist>
-    <para><inlinemediaobject><imageobject><imagedata
+    <mediaobject><imageobject><imagedata contentwidth="6in"
                     fileref="../images/General_Architecture3.png"
-                /></imageobject></inlinemediaobject>Running up to 140
+                /></imageobject></mediaobject>
+    <para>Running up to 140
         web instances and the small number of MariaDB instances
         requires 292 vCPUs available, as well as 584 GB RAM. On a
         typical 1U server using dual-socket hex-core Intel CPUs with
diff --git a/doc/arch-design/hybrid/section_architecture_hybrid.xml b/doc/arch-design/hybrid/section_architecture_hybrid.xml
index 1c74be9f89..3b31244920 100644
--- a/doc/arch-design/hybrid/section_architecture_hybrid.xml
+++ b/doc/arch-design/hybrid/section_architecture_hybrid.xml
@@ -20,7 +20,7 @@
         Management Platform.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Cloud_Priv-AWS4.png"
             />
         </imageobject>
diff --git a/doc/arch-design/hybrid/section_prescriptive_examples_hybrid.xml b/doc/arch-design/hybrid/section_prescriptive_examples_hybrid.xml
index c5b2ac6825..eb60e4f056 100644
--- a/doc/arch-design/hybrid/section_prescriptive_examples_hybrid.xml
+++ b/doc/arch-design/hybrid/section_prescriptive_examples_hybrid.xml
@@ -39,7 +39,7 @@
         below.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Cloud_Priv-Pub3.png"
             />
         </imageobject>
@@ -78,7 +78,7 @@
         similar to the figure below:</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Cloud_Priv-AWS4.png"
             />
         </imageobject>
@@ -120,7 +120,7 @@
         the figure below:</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Cloud_failover2.png"
             />
         </imageobject>
diff --git a/doc/arch-design/massively_scalable/section_tech_considerations_massively_scalable.xml b/doc/arch-design/massively_scalable/section_tech_considerations_massively_scalable.xml
index 36bbdbebb3..6290fc6824 100644
--- a/doc/arch-design/massively_scalable/section_tech_considerations_massively_scalable.xml
+++ b/doc/arch-design/massively_scalable/section_tech_considerations_massively_scalable.xml
@@ -119,7 +119,7 @@
         networks, or GPU cards.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata  contentwidth="6in"
                 fileref="../images/Massively_Scalable_Cells_+_regions_+_azs.png"
             />
         </imageobject>
diff --git a/doc/arch-design/multi_site/section_architecture_multi_site.xml b/doc/arch-design/multi_site/section_architecture_multi_site.xml
index 5f289dfa63..37905f46a3 100644
--- a/doc/arch-design/multi_site/section_architecture_multi_site.xml
+++ b/doc/arch-design/multi_site/section_architecture_multi_site.xml
@@ -17,7 +17,7 @@
         depending on the user and technical requirements.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Site_shared_keystone_horizon_swift1.png"/>
         </imageobject>
     </mediaobject>
diff --git a/doc/arch-design/multi_site/section_prescriptive_examples_multi_site.xml b/doc/arch-design/multi_site/section_prescriptive_examples_multi_site.xml
index 73ee583b18..be7b02d8f1 100644
--- a/doc/arch-design/multi_site/section_prescriptive_examples_multi_site.xml
+++ b/doc/arch-design/multi_site/section_prescriptive_examples_multi_site.xml
@@ -78,7 +78,7 @@
         and paired edge data centers:</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Site_Customer_Edge.png"/>
         </imageobject>
     </mediaobject>
@@ -179,7 +179,7 @@
         redundant and does have any awareness of geo location.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-site_Geo_Redundant_LB.png"/>
         </imageobject>
     </mediaobject></section>
@@ -211,7 +211,7 @@
         site where the application completes the request.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Multi-Site_shared_keystone1.png"/>
         </imageobject>
     </mediaobject></section>
diff --git a/doc/arch-design/network_focus/section_prescriptive_examples_network_focus.xml b/doc/arch-design/network_focus/section_prescriptive_examples_network_focus.xml
index 46161a49a0..53bd49431d 100644
--- a/doc/arch-design/network_focus/section_prescriptive_examples_network_focus.xml
+++ b/doc/arch-design/network_focus/section_prescriptive_examples_network_focus.xml
@@ -37,7 +37,7 @@
         links to the load balancer.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Network_Web_Services1.png"
             />
         </imageobject>
@@ -169,7 +169,7 @@
         traffic.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Network_Cloud_Storage2.png"
             />
         </imageobject>
diff --git a/doc/arch-design/specialized/section_hardware_specialized.xml b/doc/arch-design/specialized/section_hardware_specialized.xml
index dbf10441b1..6eef311939 100644
--- a/doc/arch-design/specialized/section_hardware_specialized.xml
+++ b/doc/arch-design/specialized/section_hardware_specialized.xml
@@ -39,7 +39,7 @@
         https://wiki.openstack.org/wiki/Pci_passthrough#How_to_check_PCI_status_with_PCI_api_patches.</para>
     <mediaobject>
         <imageobject>
-            <imagedata fileref="../images/Specialized_Hardware2.png"/>
+            <imagedata contentwidth="6in" fileref="../images/Specialized_Hardware2.png"/>
         </imageobject>
     </mediaobject></section>
 </section>
diff --git a/doc/arch-design/specialized/section_multi_hypervisor_specialized.xml b/doc/arch-design/specialized/section_multi_hypervisor_specialized.xml
index a78c373c9a..a1396249d6 100644
--- a/doc/arch-design/specialized/section_multi_hypervisor_specialized.xml
+++ b/doc/arch-design/specialized/section_multi_hypervisor_specialized.xml
@@ -23,7 +23,7 @@
         OpenStack.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Compute_NSX.png"
             />
         </imageobject>
diff --git a/doc/arch-design/specialized/section_openstack_on_openstack_specialized.xml b/doc/arch-design/specialized/section_openstack_on_openstack_specialized.xml
index 410a1a6a86..773914fbca 100644
--- a/doc/arch-design/specialized/section_openstack_on_openstack_specialized.xml
+++ b/doc/arch-design/specialized/section_openstack_on_openstack_specialized.xml
@@ -62,7 +62,7 @@
     <section xml:id="nested-cloud-diagram"><title>Diagram</title>
     <para><mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Specialized_OOO.png"
             />
         </imageobject>
diff --git a/doc/arch-design/storage_focus/section_prescriptive_examples_storage_focus.xml b/doc/arch-design/storage_focus/section_prescriptive_examples_storage_focus.xml
index 8faadccc83..c2a7247d22 100644
--- a/doc/arch-design/storage_focus/section_prescriptive_examples_storage_focus.xml
+++ b/doc/arch-design/storage_focus/section_prescriptive_examples_storage_focus.xml
@@ -21,7 +21,7 @@
         architecture:</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Storage_Object.png"
             />
         </imageobject>
@@ -76,7 +76,7 @@
         Hadoop cluster within the cloud.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Storage_Hadoop3.png"
             />
         </imageobject>
@@ -110,7 +110,7 @@
         SSD cache layer.</para>
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="6in"
                 fileref="../images/Storage_Database_+_Object5.png"
             />
         </imageobject>