diff --git a/master-web/static/digital-ocean.png b/master-web/static/digital-ocean.png
deleted file mode 100644
index ee98b493..00000000
Binary files a/master-web/static/digital-ocean.png and /dev/null differ
diff --git a/master-web/static/raptorcs.png b/master-web/static/raptorcs.png
new file mode 100644
index 00000000..a72a1033
Binary files /dev/null and b/master-web/static/raptorcs.png differ
diff --git a/master-web/static/tarsnap.png b/master-web/static/tarsnap.png
deleted file mode 100644
index dfbd6f32..00000000
Binary files a/master-web/static/tarsnap.png and /dev/null differ
diff --git a/master-web/templates/home.jade b/master-web/templates/home.jade
index f5f43606..8ff66fcf 100644
--- a/master-web/templates/home.jade
+++ b/master-web/templates/home.jade
@@ -14,49 +14,49 @@
           li
             | The Grid Display (
             a(href="#grid?branch=10.3") 10.3
-            | ,
+            | , 
             a(href="#grid?branch=10.4") 10.4
-            | ,
+            | , 
             a(href="#grid?branch=10.5") 10.5
-            | ,
+            | , 
             a(href="#grid?branch=10.6") 10.6
-            | ,
+            | , 
             a(href="#grid?branch=10.8") 10.8
-            | ,
+            | , 
             a(href="#grid?branch=10.9") 10.9
-            | ,
+            | , 
             a(href="#grid?branch=10.10") 10.10
-            | ,
+            | , 
             a(href="#grid?branch=10.11") 10.11
-            | ,
+            | , 
             a(href="#grid?branch=11.0") 11.0
-            | ,
+            | , 
             a(href="#grid?branch=11.1") 11.1
-            | ,
-            a(href="#grid?branch=11.2") 11.2
-            | ,
-            a(href="#grid?branch=11.3") 11.3
-            | ,
-            a(href="#grid?branch=11.4") 11.4
+            | , 
+            a(href="#grid?branch=11.1") 11.2
+            | , 
+            a(href="#grid?branch=11.1") 11.3
+            | , 
+            a(href="#grid?branch=11.2") 11.4
             | ) will give you a developer-oriented summary of recent buildbot activity.
           li
-            | The
+            | The 
             a(href="#builders") Builders
             |  and their most recent builds are here.
           li
-            | The list of
+            | The list of 
             a(href="#pendingbuildrequests") Pending Buildrequests
             |  is here.
           li
-            | The latest
+            | The latest 
             a(href="#changes") Changes
             |  are here.
           li
-            | If you encounter any problems please open an issue on
+            | If you encounter any problems please open an issue on 
             a(href="https://jira.mariadb.org/") Jira
             | .
           li
-            | If you have any more questions please contact us on
+            | If you have any more questions please contact us on 
             a(href="https://mariadb.zulipchat.com/") Zulip
             | .
           li
@@ -102,7 +102,7 @@
                 li
                   | PyMySQL
             li
-              | Packages built by buildbot can be downloaded from
+              | Packages built by buildbot can be downloaded from 
               a(href="https://ci.mariadb.org") here
               | .
             li
@@ -125,13 +125,18 @@
         h4 Sponsors
         .row
           .col-md-4
-            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/worksonarm-logo.png", width="50%")
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/AMD-logo.png", width="50%", padding-top=10px)
           .col-md-4
             img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/IBM-Logo.svg", width="50%")
           .col-md-4
             img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/Huawei-Logo.png", width="50%")
-        .row
-          .col-md-6
-            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/AMD-logo.png", width="40%")
-          .col-md-6
-            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/bytemark.png", width="50%")
+          .col-md-4
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/hetzner.png", width="50%")
+          .col-md-4
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/worksonarm-logo.png", width="50%")
+          .col-md-4
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/raptorcs.png", width="50%")
+          .col-md-4
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/bytemark.png", width="40%")
+          .col-md-4
+            img(class="center-block", src="https://buildbot.mariadb.org/wsgi_dashboards/sponsor/static/gameserverkings.png", width="40%")
diff --git a/master-web/templates/sponsor.html b/master-web/templates/sponsor.html
index 2eecd262..47696f90 100644
--- a/master-web/templates/sponsor.html
+++ b/master-web/templates/sponsor.html
@@ -1,45 +1,144 @@
 <div class="container sponsor">
     <style>
+        div.sponsor {
+            width: 200px;
+            height: 150px;
+        }
+        img.sponsor {
+            width: 100%;
+            height: 100%;
+            object-fit: contain;
+        }
+        td.desc {
+            padding-left: 20px;
+        }
     </style>
-    <h3><u>Sponsors</u></h3>
-    <p>
-    <a href="https://www.amd.com" target="_blank"><img src="{{url_for('static', filename='AMD-logo.png')}}" alt="AMD logo" width="250"/></a>
-    <br />
-    AMD is helping MariaDB by providing hardware resources. Thanks to AMDs massively parallel machines we are able to ensure the quality and performance of MariaDB Server.
-    </p>
-
-    <br />
-
-    <p>
-    <a href="https://developer.arm.com" target="_blank"><img src="{{url_for('static', filename='worksonarm-logo.png')}}" alt="Works on ARM logo" width="250"/></a>
-    <br />
-    WorksOnArm supports building MariaDB packages for ARM by providing substantial compute power, in the form of 2x80 Core ARM cpus.
-    </p>
-
-    <br />
-    <p>
-    <a href="https://www.ibm.com/" target="_blank"><img src="{{url_for('static', filename='IBM-Logo.svg')}}" alt="IBM logo" width="250"/></a>
-    <br />
-    IBM graciously donated one powerful dedicated Linux Power9 server, and s390x and AIX LPARs to the MariaDB Foundation which we are using to extend our supported platforms continuous testing coverage. Visit <a href="https://www.ibm.com/" target="_blank">IBM.com</a> to view their cloud and dedicated hosting offering.
-    </p>
-
-    <br />
-    <p>
-    <a href="https://www.huawei.com/" target="_blank"><img src="{{url_for('static', filename='Huawei-Logo.png')}}" alt="Huawei logo" width="250"/></a>
-    <br />
-    Huawei graciously donated one dedicated ARM server to the MariaDB Foundation which we are using to extend our supported platforms continuous testing coverage.
-    </p>
-
-    <br />
-    <p>
-    <a href="https://www.bytemark.co.uk/" target="_blank"><img src="{{url_for('static', filename='bytemark.png')}}" alt="Bytemark logo" width="250"/></a>
-    <br />
-    Bytemark graciously donated one dedicated machine on which we are running <i>ubuntu-2004-bigtest</i> builds. Visit <a href="https://www.bytemark.co.uk" target="_blank">Bytemark.co.uk</a> to view their cloud and dedicated hosting offering.
-    </p>
-
-    <br />
-
-
-
-
+    <h3 align="center">Sponsors</h3>
+    <table>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.amd.com"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='AMD-logo.png')}}"
+                            alt="AMD logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                AMD is helping MariaDB by providing hardware resources. Thanks
+                to AMDs massively parallel machines we are able to ensure the
+                quality and performance of MariaDB Server.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://developer.arm.com"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='worksonarm-logo.png')}}"
+                            alt="Works on ARM logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                WorksOnArm supports building MariaDB packages for ARM by
+                providing substantial compute power, in the form of 2x80 Core
+                ARM cpus.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.ibm.com/"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='IBM-Logo.svg')}}"
+                            alt="IBM logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                IBM graciously donated one powerful dedicated Linux Power9
+                server, and s390x and AIX LPARs to the MariaDB Foundation which
+                we are using to extend our supported platforms continuous
+                testing coverage. Visit
+                <a href="https://www.ibm.com/" target="_blank">IBM.com</a> to
+                view their cloud and dedicated hosting offering.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.huawei.com/"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='Huawei-Logo.png')}}"
+                            alt="Huawei logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                Huawei graciously donated one dedicated ARM server to the
+                MariaDB Foundation which we are using to extend our supported
+                platforms continuous testing coverage.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.hetzner.com/"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='hetzner.png')}}"
+                            alt="Raptor CS logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                Hetzner supports building MariaDB packages for ARM by providing
+                substantial compute power, in the form of 2
+                <a href="https://www.hetzner.com/dedicated-rootserver/rx220"
+                    >RX220</a
+                >
+                machines.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.bytemark.co.uk/"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='bytemark.png')}}"
+                            alt="Bytemark logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                Bytemark graciously donated one dedicated machine on which we
+                are running <i>ubuntu-2004-bigtest</i> builds. Visit
+                <a href="https://www.bytemark.co.uk">Bytemark.co.uk</a>
+                to view their cloud and dedicated hosting offering.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <div class="sponsor">
+                    <a href="https://www.raptorcs.com/"
+                        ><img
+                            class="sponsor"
+                            src="{{url_for('static', filename='raptorcs.png')}}"
+                            alt="Raptor CS logo"
+                    /></a>
+                </div>
+            </td>
+            <td class="desc">
+                Raptor Computing Systems supports building MariaDB packages for
+                PowerPC by providing one dedicated P9 machine.
+            </td>
+        </tr>
+    </table>
 </div>
diff --git a/static/AMD-logo.png b/static/AMD-logo.png
new file mode 100644
index 00000000..8c76fcb5
Binary files /dev/null and b/static/AMD-logo.png differ
diff --git a/static/digital-ocean.png b/static/digital-ocean.png
deleted file mode 100644
index ee98b493..00000000
Binary files a/static/digital-ocean.png and /dev/null differ
diff --git a/static/raptorcs.png b/static/raptorcs.png
new file mode 100644
index 00000000..a72a1033
Binary files /dev/null and b/static/raptorcs.png differ
diff --git a/static/tarsnap.png b/static/tarsnap.png
deleted file mode 100644
index dfbd6f32..00000000
Binary files a/static/tarsnap.png and /dev/null differ
diff --git a/static/worksonarm-logo.png b/static/worksonarm-logo.png
new file mode 100644
index 00000000..d4df3ba3
Binary files /dev/null and b/static/worksonarm-logo.png differ