diff --git a/pom.xml b/pom.xml
index aa5811f257..7feac97094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,8 +168,8 @@
                                     <resource>
                                         <directory>${project.basedir}</directory>
                                         <includes>
-                                            <include>images/**</include>
-                                            <include>${imagesDir}/**</include>
+                                            <include>images/**/*.png</include>
+                                            <include>${imagesDir}/**/*.png</include>
                                         </includes>
                                     </resource>
                                 </resources>
diff --git a/server_installation/keycloak-images/cross-dc-architecture.png b/server_installation/keycloak-images/cross-dc-architecture.png
index 16fc09c221..7bb893c5d2 100644
Binary files a/server_installation/keycloak-images/cross-dc-architecture.png and b/server_installation/keycloak-images/cross-dc-architecture.png differ
diff --git a/server_installation/keycloak-images/cross-dc-architecture.svg b/server_installation/keycloak-images/cross-dc-architecture.svg
new file mode 100644
index 0000000000..dfcec2743e
--- /dev/null
+++ b/server_installation/keycloak-images/cross-dc-architecture.svg
@@ -0,0 +1,181 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="760" height="421.5" viewBox="0 0 760 421.5">
+  <defs>
+    <style>
+      .a {
+        font-size: 10px;
+        fill: #f3f3f3;
+        font-family: RedHatText-Regular, Red Hat Text;
+      }
+
+      .b, .f, .j, .k, .o, .p, .r {
+        fill: none;
+      }
+
+      .c {
+        fill: #e8e8e8;
+      }
+
+      .d {
+        font-size: 14px;
+      }
+
+      .d, .g, .h, .m, .n {
+        fill: #151515;
+      }
+
+      .d, .m {
+        font-family: RedHatText-Bold, Red Hat Text;
+        font-weight: 700;
+      }
+
+      .e, .h, .m, .n {
+        font-size: 11px;
+      }
+
+      .e {
+        font-family: LiberationMono, Liberation Mono;
+        font-weight: 400;
+        letter-spacing: 0em;
+      }
+
+      .f {
+        stroke: #151515;
+      }
+
+      .f, .i, .j, .k, .o, .p, .r {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .h {
+        font-family: RedHatText-Medium, Red Hat Text;
+        font-weight: 500;
+      }
+
+      .i, .l {
+        fill: #fff;
+      }
+
+      .i, .j, .k {
+        stroke: #5b5b5b;
+      }
+
+      .i, .k {
+        stroke-width: 1.5px;
+      }
+
+      .j {
+        stroke-width: 2px;
+      }
+
+      .n {
+        font-family: RedHatText-Italic, Red Hat Text;
+        font-style: italic;
+      }
+
+      .o, .p, .r {
+        stroke: #06c;
+      }
+
+      .p {
+        stroke-dasharray: 3.009 3.009;
+      }
+
+      .q {
+        fill: #06c;
+      }
+
+      .r {
+        stroke-dasharray: 2.984 2.984;
+      }
+    </style>
+  </defs>
+  <title>cross-datacenter-arch</title>
+  <g>
+    <text class="a" transform="translate(679.802 404.517)">70_RHSSO_0320</text>
+    <rect class="b" y="381.5" width="760" height="40"/>
+  </g>
+  <rect class="c" x="475" y="99" width="285" height="282.5"/>
+  <rect class="c" y="99" width="285" height="282.5"/>
+  <text class="d" transform="translate(20 362.23)">Datacenter <tspan class="e" x="81.646" y="0">(site1)</tspan></text>
+  <g>
+    <line class="f" x1="64.236" y1="169" x2="64.236" y2="271.824"/>
+    <polygon class="g" points="59.25 270.365 64.236 279 69.223 270.365 59.25 270.365"/>
+  </g>
+  <g>
+    <line class="f" x1="142.5" y1="168.695" x2="142.5" y2="193.824"/>
+    <polygon class="g" points="137.514 192.365 142.5 201 147.486 192.365 137.514 192.365"/>
+  </g>
+  <g>
+    <polyline class="f" points="372.5 63.25 372.5 78.25 142.568 78.25 142.568 109.574"/>
+    <polygon class="g" points="137.581 108.115 142.568 116.75 147.554 108.115 137.581 108.115"/>
+  </g>
+  <g>
+    <polyline class="f" points="387.5 63.25 387.5 78.25 617.432 78.25 617.432 109.574"/>
+    <polygon class="g" points="612.446 108.115 617.432 116.75 622.419 108.115 612.446 108.115"/>
+  </g>
+  <g>
+    <text class="h" transform="translate(343.469 55.095)">Load balancer</text>
+    <g>
+      <rect class="i" x="352.5" y="24.75" width="55" height="13.75"/>
+      <line class="j" x1="401.621" y1="30.647" x2="401.621" y2="30.647"/>
+      <line class="k" x1="358.393" y1="30.113" x2="358.393" y2="33.077"/>
+      <line class="k" x1="364.286" y1="30.113" x2="364.286" y2="33.077"/>
+      <line class="k" x1="370.179" y1="30.113" x2="370.179" y2="33.077"/>
+      <line class="k" x1="376.071" y1="30.113" x2="376.071" y2="33.077"/>
+      <line class="k" x1="381.964" y1="30.113" x2="381.964" y2="33.077"/>
+      <line class="k" x1="387.857" y1="30.113" x2="387.857" y2="33.077"/>
+    </g>
+  </g>
+  <rect class="l" x="20" y="281.5" width="245" height="50"/>
+  <text class="m" transform="translate(95.296 310.713)">Infinispan cluster</text>
+  <rect class="l" x="20" y="119" width="245" height="50"/>
+  <text class="m" transform="translate(97.436 148.213)">Keycloak cluster</text>
+  <g>
+    <text class="h" transform="translate(117.921 251.215)">Database</text>
+    <g>
+      <path class="i" d="M124.051,214.192v10.193c0,5.629,8.259,10.192,18.449,10.192s18.449-4.563,18.449-10.192V214.192"/>
+      <ellipse class="i" cx="142.5" cy="214.192" rx="18.449" ry="10.192"/>
+    </g>
+  </g>
+  <rect class="c" x="46.457" y="205.192" width="35.56" height="29.115"/>
+  <text class="n" transform="translate(45.025 216.874)">Remote<tspan x="6.71" y="12">store</tspan></text>
+  <text class="d" transform="translate(495 362.23)">Datacenter <tspan class="e" x="81.646" y="0">(site2)</tspan></text>
+  <g>
+    <line class="f" x1="695.764" y1="169" x2="695.764" y2="271.824"/>
+    <polygon class="g" points="690.777 270.365 695.764 279 700.75 270.365 690.777 270.365"/>
+  </g>
+  <g>
+    <line class="f" x1="617.5" y1="168.695" x2="617.5" y2="193.824"/>
+    <polygon class="g" points="612.514 192.365 617.5 201 622.486 192.365 612.514 192.365"/>
+  </g>
+  <rect class="l" x="495" y="281.5" width="245" height="50" transform="translate(1235 613) rotate(-180)"/>
+  <text class="m" transform="translate(570.296 310.713)">Infinispan cluster</text>
+  <rect class="l" x="495" y="119" width="245" height="50"/>
+  <text class="m" transform="translate(572.436 148.213)">Keycloak cluster</text>
+  <g>
+    <text class="h" transform="translate(592.921 251.215)">Database</text>
+    <g>
+      <path class="i" d="M599.051,214.192v10.193c0,5.629,8.259,10.192,18.449,10.192s18.449-4.563,18.449-10.192V214.192"/>
+      <ellipse class="i" cx="617.5" cy="214.192" rx="18.449" ry="10.192"/>
+    </g>
+  </g>
+  <rect class="c" x="677.984" y="205.192" width="35.56" height="29.115"/>
+  <text class="n" transform="translate(676.553 216.874)">Remote<tspan x="6.71" y="12">store</tspan></text>
+  <g>
+    <line class="o" x1="485.324" y1="306.5" x2="483.824" y2="306.5"/>
+    <line class="p" x1="480.814" y1="306.5" x2="277.681" y2="306.5"/>
+    <line class="o" x1="276.176" y1="306.5" x2="274.676" y2="306.5"/>
+    <polygon class="q" points="483.865 301.514 492.5 306.5 483.865 311.486 483.865 301.514"/>
+    <polygon class="q" points="276.135 301.514 267.5 306.5 276.135 311.486 276.135 301.514"/>
+  </g>
+  <g>
+    <line class="o" x1="588.875" y1="219.752" x2="587.375" y2="219.752"/>
+    <line class="r" x1="584.391" y1="219.752" x2="174.116" y2="219.752"/>
+    <line class="o" x1="172.624" y1="219.752" x2="171.124" y2="219.752"/>
+    <polygon class="q" points="587.416 214.766 596.051 219.752 587.416 224.739 587.416 214.766"/>
+    <polygon class="q" points="172.583 214.766 163.948 219.752 172.583 224.739 172.583 214.766"/>
+  </g>
+  <text class="n" transform="translate(308.154 298.472)">Cross-Datacenter Replication</text>
+  <text class="n" transform="translate(323.438 211.724)">Active/Active database</text>
+</svg>
diff --git a/server_installation/rhsso-images/cross-dc-architecture.png b/server_installation/rhsso-images/cross-dc-architecture.png
index 871c2118c1..eee8d2e9b8 100644
Binary files a/server_installation/rhsso-images/cross-dc-architecture.png and b/server_installation/rhsso-images/cross-dc-architecture.png differ
diff --git a/server_installation/rhsso-images/cross-dc-architecture.svg b/server_installation/rhsso-images/cross-dc-architecture.svg
new file mode 100644
index 0000000000..034501e5f4
--- /dev/null
+++ b/server_installation/rhsso-images/cross-dc-architecture.svg
@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="760"
+   height="421.5"
+   viewBox="0 0 760 421.5"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="cross-dc-architecture_rhsso.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <metadata
+     id="metadata164">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>cross-datacenter-arch</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1669"
+     inkscape:window-height="984"
+     id="namedview162"
+     showgrid="false"
+     inkscape:zoom="2"
+     inkscape:cx="291.10606"
+     inkscape:cy="210.75"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg160" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">
+      .a {
+        font-size: 10px;
+        fill: #f3f3f3;
+        font-family: RedHatText-Regular, Red Hat Text;
+      }
+
+      .b, .f, .j, .k, .o, .p, .r {
+        fill: none;
+      }
+
+      .c {
+        fill: #e8e8e8;
+      }
+
+      .d {
+        font-size: 14px;
+      }
+
+      .d, .g, .h, .m, .n {
+        fill: #151515;
+      }
+
+      .d, .m {
+        font-family: RedHatText-Bold, Red Hat Text;
+        font-weight: 700;
+      }
+
+      .e, .h, .m, .n {
+        font-size: 11px;
+      }
+
+      .e {
+        font-family: LiberationMono, Liberation Mono;
+        font-weight: 400;
+        letter-spacing: 0em;
+      }
+
+      .f {
+        stroke: #151515;
+      }
+
+      .f, .i, .j, .k, .o, .p, .r {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .h {
+        font-family: RedHatText-Medium, Red Hat Text;
+        font-weight: 500;
+      }
+
+      .i, .l {
+        fill: #fff;
+      }
+
+      .i, .j, .k {
+        stroke: #5b5b5b;
+      }
+
+      .i, .k {
+        stroke-width: 1.5px;
+      }
+
+      .j {
+        stroke-width: 2px;
+      }
+
+      .n {
+        font-family: RedHatText-Italic, Red Hat Text;
+        font-style: italic;
+      }
+
+      .o, .p, .r {
+        stroke: #06c;
+      }
+
+      .p {
+        stroke-dasharray: 3.009 3.009;
+      }
+
+      .q {
+        fill: #06c;
+      }
+
+      .r {
+        stroke-dasharray: 2.984 2.984;
+      }
+    </style>
+  </defs>
+  <title
+     id="title6">cross-datacenter-arch</title>
+  <g
+     id="g12">
+    <text
+       class="a"
+       transform="translate(679.802 404.517)"
+       id="text8">70_RHSSO_0320</text>
+    <rect
+       class="b"
+       y="381.5"
+       width="760"
+       height="40"
+       id="rect10" />
+  </g>
+  <rect
+     class="c"
+     x="475"
+     y="99"
+     width="285"
+     height="282.5"
+     id="rect14" />
+  <rect
+     class="c"
+     y="99"
+     width="285"
+     height="282.5"
+     id="rect16" />
+  <text
+     class="d"
+     transform="translate(20 362.23)"
+     id="text20">Datacenter <tspan
+   class="e"
+   x="81.646"
+   y="0"
+   id="tspan18">(site1)</tspan>
+</text>
+  <g
+     id="g26">
+    <line
+       class="f"
+       x1="64.236"
+       y1="169"
+       x2="64.236"
+       y2="271.824"
+       id="line22" />
+    <polygon
+       class="g"
+       points="59.25 270.365 64.236 279 69.223 270.365 59.25 270.365"
+       id="polygon24" />
+  </g>
+  <g
+     id="g32">
+    <line
+       class="f"
+       x1="142.5"
+       y1="168.695"
+       x2="142.5"
+       y2="193.824"
+       id="line28" />
+    <polygon
+       class="g"
+       points="137.514 192.365 142.5 201 147.486 192.365 137.514 192.365"
+       id="polygon30" />
+  </g>
+  <g
+     id="g38">
+    <polyline
+       class="f"
+       points="372.5 63.25 372.5 78.25 142.568 78.25 142.568 109.574"
+       id="polyline34" />
+    <polygon
+       class="g"
+       points="137.581 108.115 142.568 116.75 147.554 108.115 137.581 108.115"
+       id="polygon36" />
+  </g>
+  <g
+     id="g44">
+    <polyline
+       class="f"
+       points="387.5 63.25 387.5 78.25 617.432 78.25 617.432 109.574"
+       id="polyline40" />
+    <polygon
+       class="g"
+       points="612.446 108.115 617.432 116.75 622.419 108.115 612.446 108.115"
+       id="polygon42" />
+  </g>
+  <g
+     id="g66">
+    <text
+       class="h"
+       transform="translate(343.469 55.095)"
+       id="text46">Load balancer</text>
+    <g
+       id="g64">
+      <rect
+         class="i"
+         x="352.5"
+         y="24.75"
+         width="55"
+         height="13.75"
+         id="rect48" />
+      <line
+         class="j"
+         x1="401.621"
+         y1="30.647"
+         x2="401.621"
+         y2="30.647"
+         id="line50" />
+      <line
+         class="k"
+         x1="358.393"
+         y1="30.113"
+         x2="358.393"
+         y2="33.077"
+         id="line52" />
+      <line
+         class="k"
+         x1="364.286"
+         y1="30.113"
+         x2="364.286"
+         y2="33.077"
+         id="line54" />
+      <line
+         class="k"
+         x1="370.179"
+         y1="30.113"
+         x2="370.179"
+         y2="33.077"
+         id="line56" />
+      <line
+         class="k"
+         x1="376.071"
+         y1="30.113"
+         x2="376.071"
+         y2="33.077"
+         id="line58" />
+      <line
+         class="k"
+         x1="381.964"
+         y1="30.113"
+         x2="381.964"
+         y2="33.077"
+         id="line60" />
+      <line
+         class="k"
+         x1="387.857"
+         y1="30.113"
+         x2="387.857"
+         y2="33.077"
+         id="line62" />
+    </g>
+  </g>
+  <rect
+     class="l"
+     x="20"
+     y="281.5"
+     width="245"
+     height="50"
+     id="rect68" />
+  <text
+     class="m"
+     transform="translate(95.296,310.713)"
+     id="text70"
+     style="font-weight:700;font-size:11px;font-family:RedHatText-Bold, 'Red Hat Text';fill:#151515">Data Grid cluster</text>
+  <rect
+     class="l"
+     x="20"
+     y="119"
+     width="245"
+     height="50"
+     id="rect72" />
+  <text
+     class="m"
+     transform="translate(97.436,148.213)"
+     id="text74"
+     style="font-weight:700;font-size:11px;font-family:RedHatText-Bold, 'Red Hat Text';fill:#151515">RH SSO cluster</text>
+  <g
+     id="g84">
+    <text
+       class="h"
+       transform="translate(117.921 251.215)"
+       id="text76">Database</text>
+    <g
+       id="g82">
+      <path
+         class="i"
+         d="M124.051,214.192v10.193c0,5.629,8.259,10.192,18.449,10.192s18.449-4.563,18.449-10.192V214.192"
+         id="path78" />
+      <ellipse
+         class="i"
+         cx="142.5"
+         cy="214.192"
+         rx="18.449"
+         ry="10.192"
+         id="ellipse80" />
+    </g>
+  </g>
+  <rect
+     class="c"
+     x="46.457"
+     y="205.192"
+     width="35.56"
+     height="29.115"
+     id="rect86" />
+  <text
+     class="n"
+     transform="translate(45.025 216.874)"
+     id="text90">Remote<tspan
+   x="6.71"
+   y="12"
+   id="tspan88">store</tspan>
+</text>
+  <text
+     class="d"
+     transform="translate(495 362.23)"
+     id="text94">Datacenter <tspan
+   class="e"
+   x="81.646"
+   y="0"
+   id="tspan92">(site2)</tspan>
+</text>
+  <g
+     id="g100">
+    <line
+       class="f"
+       x1="695.764"
+       y1="169"
+       x2="695.764"
+       y2="271.824"
+       id="line96" />
+    <polygon
+       class="g"
+       points="690.777 270.365 695.764 279 700.75 270.365 690.777 270.365"
+       id="polygon98" />
+  </g>
+  <g
+     id="g106">
+    <line
+       class="f"
+       x1="617.5"
+       y1="168.695"
+       x2="617.5"
+       y2="193.824"
+       id="line102" />
+    <polygon
+       class="g"
+       points="612.514 192.365 617.5 201 622.486 192.365 612.514 192.365"
+       id="polygon104" />
+  </g>
+  <rect
+     class="l"
+     x="495"
+     y="281.5"
+     width="245"
+     height="50"
+     transform="translate(1235 613) rotate(-180)"
+     id="rect108" />
+  <text
+     class="m"
+     transform="translate(570.296,310.713)"
+     id="text110"
+     style="font-weight:700;font-size:11px;font-family:RedHatText-Bold, 'Red Hat Text';fill:#151515"
+     inkscape:export-filename="/home/amunro/git-repos/kc/server_installation/rhsso-images/cross-dc-architecture.png"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">Data Grid cluster</text>
+  <rect
+     class="l"
+     x="495"
+     y="119"
+     width="245"
+     height="50"
+     id="rect112" />
+  <text
+     class="m"
+     transform="translate(572.436,148.213)"
+     id="text114"
+     style="font-weight:700;font-size:11px;font-family:RedHatText-Bold, 'Red Hat Text';fill:#151515">RH SSO cluster</text>
+  <g
+     id="g124">
+    <text
+       class="h"
+       transform="translate(592.921 251.215)"
+       id="text116">Database</text>
+    <g
+       id="g122">
+      <path
+         class="i"
+         d="M599.051,214.192v10.193c0,5.629,8.259,10.192,18.449,10.192s18.449-4.563,18.449-10.192V214.192"
+         id="path118" />
+      <ellipse
+         class="i"
+         cx="617.5"
+         cy="214.192"
+         rx="18.449"
+         ry="10.192"
+         id="ellipse120" />
+    </g>
+  </g>
+  <rect
+     class="c"
+     x="677.984"
+     y="205.192"
+     width="35.56"
+     height="29.115"
+     id="rect126" />
+  <text
+     class="n"
+     transform="translate(676.553 216.874)"
+     id="text130">Remote<tspan
+   x="6.71"
+   y="12"
+   id="tspan128">store</tspan>
+</text>
+  <g
+     id="g142">
+    <line
+       class="o"
+       x1="485.324"
+       y1="306.5"
+       x2="483.824"
+       y2="306.5"
+       id="line132" />
+    <line
+       class="p"
+       x1="480.814"
+       y1="306.5"
+       x2="277.681"
+       y2="306.5"
+       id="line134" />
+    <line
+       class="o"
+       x1="276.176"
+       y1="306.5"
+       x2="274.676"
+       y2="306.5"
+       id="line136" />
+    <polygon
+       class="q"
+       points="483.865 301.514 492.5 306.5 483.865 311.486 483.865 301.514"
+       id="polygon138" />
+    <polygon
+       class="q"
+       points="276.135 301.514 267.5 306.5 276.135 311.486 276.135 301.514"
+       id="polygon140" />
+  </g>
+  <g
+     id="g154">
+    <line
+       class="o"
+       x1="588.875"
+       y1="219.752"
+       x2="587.375"
+       y2="219.752"
+       id="line144" />
+    <line
+       class="r"
+       x1="584.391"
+       y1="219.752"
+       x2="174.116"
+       y2="219.752"
+       id="line146" />
+    <line
+       class="o"
+       x1="172.624"
+       y1="219.752"
+       x2="171.124"
+       y2="219.752"
+       id="line148" />
+    <polygon
+       class="q"
+       points="587.416 214.766 596.051 219.752 587.416 224.739 587.416 214.766"
+       id="polygon150" />
+    <polygon
+       class="q"
+       points="172.583 214.766 163.948 219.752 172.583 224.739 172.583 214.766"
+       id="polygon152" />
+  </g>
+  <text
+     class="n"
+     transform="translate(308.154 298.472)"
+     id="text156">Cross-Datacenter Replication</text>
+  <text
+     class="n"
+     transform="translate(323.438 211.724)"
+     id="text158">Active/Active database</text>
+</svg>
diff --git a/server_installation/topics/operating-mode/crossdc.adoc b/server_installation/topics/operating-mode/crossdc.adoc
index fac01ef5eb..9f216db82f 100644
--- a/server_installation/topics/operating-mode/crossdc.adoc
+++ b/server_installation/topics/operating-mode/crossdc.adoc
@@ -8,7 +8,7 @@ include::../templates/techpreview.adoc[]
 
 Cross-Datacenter Replication mode is for when you want to run {project_name} in a cluster across multiple data centers, most typically using data center sites that are in different geographic regions. When using this mode, each data center will have its own cluster of {project_name} servers.
 
-This documentation will refer the following example architecture diagram to illustrate and describe a simple Cross-Datacenter Replication use case.
+This documentation will refer to the following example architecture diagram to illustrate and describe a simple Cross-Datacenter Replication use case.
 
 [[archdiagram]]
 .Example Architecture Diagram