diff --git a/images/maas-rack-controller/2.3_secure_headers.patch b/images/maas-rack-controller/2.3_secure_headers.patch
new file mode 100644
index 0000000..6c006eb
--- /dev/null
+++ b/images/maas-rack-controller/2.3_secure_headers.patch
@@ -0,0 +1,2 @@
+170d169
+<         self.setHeader(b'server', version)
diff --git a/images/maas-rack-controller/Dockerfile b/images/maas-rack-controller/Dockerfile
index e9b1d8f..7dca08b 100644
--- a/images/maas-rack-controller/Dockerfile
+++ b/images/maas-rack-controller/Dockerfile
@@ -55,10 +55,12 @@ COPY 2.3_nic_filter.patch /tmp/2.3_nic_filter.patch
 COPY 2.3_mac_address.patch /tmp/2.3_mac_address.patch
 # sh8121att: patch so query for RPC info contains proper Host header
 copy 2.3_hostheader.patch /tmp/2.3_hostheader.patch
+COPY 2.3_secure_headers.patch /tmp/2.3_secure_headers.patch
 
 RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch network.py < /tmp/2.3_nic_filter.patch
 RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch ipaddr.py < /tmp/2.3_mac_address.patch
 RUN cd /usr/lib/python3/dist-packages/provisioningserver/rpc && patch clusterservice.py < /tmp/2.3_hostheader.patch
+RUN cd /usr/lib/python3/dist-packages/twisted/web && patch server.py < /tmp/2.3_secure_headers.patch
 
 # echo journalctl logs to the container's stdout
 COPY scripts/journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service
diff --git a/images/maas-region-controller/2.3_secure_headers.patch b/images/maas-region-controller/2.3_secure_headers.patch
new file mode 100644
index 0000000..6c006eb
--- /dev/null
+++ b/images/maas-region-controller/2.3_secure_headers.patch
@@ -0,0 +1,2 @@
+170d169
+<         self.setHeader(b'server', version)
diff --git a/images/maas-region-controller/Dockerfile b/images/maas-region-controller/Dockerfile
index 0643a1a..c4a2307 100644
--- a/images/maas-region-controller/Dockerfile
+++ b/images/maas-region-controller/Dockerfile
@@ -74,6 +74,7 @@ COPY 2.3_mac_address.patch /tmp/2.3_mac_address.patch
 COPY 2.3_proxy_acl.patch /tmp/2.3_proxy_acl.patch
 # Patch to add retrying to MaaS BMC user setup, and improve exception handling
 copy 2.3_configure_ipmi_user.patch /tmp/2.3_configure_ipmi_user.patch
+COPY 2.3_secure_headers.patch /tmp/2.3_secure_headers.patch
 
 RUN cd /usr/lib/python3/dist-packages/maasserver && patch preseed_network.py < /tmp/2.3_route.patch
 RUN cd /usr/lib/python3/dist-packages/maasserver && patch preseed.py < /tmp/2.3_kernel_package.patch
@@ -83,6 +84,7 @@ RUN cd /usr/lib/python3/dist-packages/metadataserver/user_data/templates/snippet
 RUN cd /usr/lib/python3/dist-packages/metadataserver/user_data/templates/snippets && patch maas_ipmi_autodetect.py < /tmp/2.3_configure_ipmi_user.patch
 RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch ipaddr.py < /tmp/2.3_mac_address.patch
 RUN cd /usr/lib/python3/dist-packages/provisioningserver/templates/proxy && patch maas-proxy.conf.template < /tmp/2.3_proxy_acl.patch
+RUN cd /usr/lib/python3/dist-packages/twisted/web && patch server.py < /tmp/2.3_secure_headers.patch
 
 COPY journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service
 RUN mkdir -p /etc/systemd/system/basic.target.wants ;\