diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 921bb6187a..f4d9c4204d 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -168,7 +168,6 @@ jdocbook {
 
     devguide {
         masterSourceDocumentName = 'Hibernate_Development_Guide.xml'
-        useRelativeImageUris = false
     }
 
     manual {
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml b/documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
index 2d99b94865..94ee9ae1b9 100644
--- a/documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
+++ b/documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
@@ -44,10 +44,10 @@
 
             <mediaobject>
                 <imageobject role="html">
-                    <imagedata fileref="images/multitenacy_database.png" format="PNG" align="center" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_database.png" format="PNG" align="center" />
                 </imageobject>
                 <imageobject role="fo">
-                    <imagedata fileref="images/multitenacy_database.svg" format="SVG" align="center" width="17cm" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_database.svg" format="SVG" align="center" width="17cm" />
                 </imageobject>
             </mediaobject>
 
@@ -64,10 +64,10 @@
 
             <mediaobject>
                 <imageobject role="html">
-                    <imagedata fileref="images/multitenacy_schema.png" format="PNG" align="center" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_schema.png" format="PNG" align="center" />
                 </imageobject>
                 <imageobject role="fo">
-                    <imagedata fileref="images/multitenacy_schema.svg" format="SVG" align="center" width="17cm" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_schema.svg" format="SVG" align="center" width="17cm" />
                 </imageobject>
             </mediaobject>
 
@@ -105,10 +105,10 @@
 
             <mediaobject>
                 <imageobject role="html">
-                    <imagedata fileref="images/multitenacy_discriminator.png" format="PNG" align="center" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_discriminator.png" format="PNG" align="center" />
                 </imageobject>
                 <imageobject role="fo">
-                    <imagedata fileref="images/multitenacy_discriminator.svg" format="SVG" align="center" width="17cm" />
+                    <imagedata fileref="chapters/multitenancy/images/multitenacy_discriminator.svg" format="SVG" align="center" width="17cm" />
                 </imageobject>
             </mediaobject>