diff --git a/lab000-virtualbox-basics.xml b/lab000-virtualbox-basics.xml
index c6c66652..21d88217 100644
--- a/lab000-virtualbox-basics.xml
+++ b/lab000-virtualbox-basics.xml
@@ -130,7 +130,7 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata  width="4in" fileref="figures/lab000-virtual-box/image03.png"/>
+        <imagedata  contentwidth="4in" fileref="figures/lab000-virtual-box/image03.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -202,7 +202,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Create Host Only Networks</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image13.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image13.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -246,7 +247,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image19.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image19.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -281,7 +283,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image16.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image16.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -315,7 +318,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Image: Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image08.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image08.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -364,7 +368,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Create New Virtual Machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image11.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image11.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -404,7 +409,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image07.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image07.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -413,7 +419,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter2 - Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image18.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image18.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -422,7 +429,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter3 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image14.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image14.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -441,7 +449,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Create New Virtual Machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image12.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image12.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -483,7 +492,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter 1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image05.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image05.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -492,7 +502,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter2 - Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image17.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image17.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -501,7 +512,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter3 - Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image02.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image02.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -510,7 +522,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter4 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image00.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image00.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -528,7 +541,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Create New Virtual Machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image04.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image04.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -565,7 +579,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image15.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image15.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -574,7 +589,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter2 - Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image10.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image10.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -583,7 +599,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
     <title>Adapter3 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image01.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image01.png"
+                   contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/lab001-control-node.xml b/lab001-control-node.xml
index d994f16f..e8d47a72 100644
--- a/lab001-control-node.xml
+++ b/lab001-control-node.xml
@@ -9,7 +9,8 @@
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image03.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image03.png"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/lab002-network-node.xml b/lab002-network-node.xml
index 9dcfcccf..f7cd493b 100644
--- a/lab002-network-node.xml
+++ b/lab002-network-node.xml
@@ -11,7 +11,8 @@
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image03.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image03.png"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/lab003-compute-node.xml b/lab003-compute-node.xml
index 69ba5611..6401ee6d 100644
--- a/lab003-compute-node.xml
+++ b/lab003-compute-node.xml
@@ -14,7 +14,8 @@
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/lab000-virtual-box/image03.png"/>
+        <imagedata fileref="figures/lab000-virtual-box/image03.png"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module001-ch004-openstack-architecture.xml b/module001-ch004-openstack-architecture.xml
index cb995d87..699518c9 100644
--- a/module001-ch004-openstack-architecture.xml
+++ b/module001-ch004-openstack-architecture.xml
@@ -23,7 +23,8 @@
     <title>Conceptual Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image13.jpg"/>
+        <imagedata fileref="figures/image13.jpg"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -66,7 +67,8 @@ as previously described:</para>
     <title>Logical diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/openstack-arch-havana-logical-v1.jpg"/>
+        <imagedata fileref="figures/openstack-arch-havana-logical-v1.jpg"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -96,7 +98,8 @@ as previously described:</para>
     <title>Horizon Dashboard</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image10.jpg"/>
+        <imagedata fileref="figures/image10.jpg"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module001-ch005-vm-provisioning-walk-through.xml b/module001-ch005-vm-provisioning-walk-through.xml
index 9ee9069a..243af509 100644
--- a/module001-ch005-vm-provisioning-walk-through.xml
+++ b/module001-ch005-vm-provisioning-walk-through.xml
@@ -175,7 +175,7 @@
     <title>Initial State</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image21.png"/>
+        <imagedata fileref="figures/image21.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -194,7 +194,7 @@
     <title>Launch VM Instance</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image09.png"/>
+        <imagedata fileref="figures/image09.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -231,7 +231,7 @@
     <title>End State</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image22.png"/>
+        <imagedata fileref="figures/image22.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module001-ch008-queues-messaging.xml b/module001-ch008-queues-messaging.xml
index 256a763e..8730c33a 100644
--- a/module001-ch008-queues-messaging.xml
+++ b/module001-ch008-queues-messaging.xml
@@ -8,7 +8,7 @@
     <title>Messaging in OpenStack</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image04.png"/>
+        <imagedata fileref="figures/image04.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -44,7 +44,7 @@
     <title>AMQP</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image24.png"/>
+        <imagedata fileref="figures/image24.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -146,7 +146,7 @@
     <title>RabbitMQ</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image20.png"/>
+        <imagedata fileref="figures/image20.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -181,7 +181,7 @@
     <title>RabbitMQ</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image28.png"/>
+        <imagedata fileref="figures/image28.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -204,7 +204,7 @@
     <title>RabbitMQ</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image20.png"/>
+        <imagedata fileref="figures/image20.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module001-ch009-vm-placement.xml b/module001-ch009-vm-placement.xml
index ae129e10..38e75098 100644
--- a/module001-ch009-vm-placement.xml
+++ b/module001-ch009-vm-placement.xml
@@ -16,7 +16,7 @@
     <title>Nova</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image29.png"/>
+        <imagedata fileref="figures/image29.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -56,7 +56,7 @@
     <title>Filtering</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image27.png"/>
+        <imagedata fileref="figures/image27.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -196,7 +196,8 @@
     <title>Weights</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../common/figures/nova-weighting-hosts.png"/>
+        <imagedata fileref="../common/figures/nova-weighting-hosts.png"
+                   contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module001-ch010-vm-provisioning-indepth.xml b/module001-ch010-vm-provisioning-indepth.xml
index f954ad71..a3de2f2e 100644
--- a/module001-ch010-vm-provisioning-indepth.xml
+++ b/module001-ch010-vm-provisioning-indepth.xml
@@ -210,7 +210,7 @@
     <title>Nova VM provisioning</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="figures/image02.png"/>
+        <imagedata fileref="figures/image02.png" contentwidth="7in"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/module002-ch001-networking-in-openstack.xml b/module002-ch001-networking-in-openstack.xml
index 49f5eec3..be3b8b4e 100644
--- a/module002-ch001-networking-in-openstack.xml
+++ b/module002-ch001-networking-in-openstack.xml
@@ -228,7 +228,7 @@
         <title>Network Diagram</title>
         <mediaobject>
             <imageobject>
-                <imagedata fileref="figures/image33.png"/>
+                <imagedata fileref="figures/image33.png" contentwidth="7in"/>
             </imageobject>
         </mediaobject>
     </figure>