diff --git a/charts/maas/templates/bin/_import-boot-resources.sh.tpl b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
index 939ded7..cb0d704 100644
--- a/charts/maas/templates/bin/_import-boot-resources.sh.tpl
+++ b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
@@ -118,6 +118,7 @@ function configure_proxy {
   check_then_set enable_http_proxy ${MAAS_PROXY_ENABLED}
   check_then_set use_peer_proxy ${MAAS_PEER_PROXY_ENABLED}
   check_then_set http_proxy ${MAAS_PROXY_SERVER}
+  check_then_set maas_proxy_port ${MAAS_INTERNAL_PROXY_PORT}
 }
 
 function configure_ntp {
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index bf032d4..b0cbf41 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -63,6 +63,8 @@ spec:
               value: {{ .Values.conf.maas.proxy.peer_proxy_enabled | quote }}
             - name: MAAS_PROXY_SERVER
               value: {{ .Values.conf.maas.proxy.proxy_server }}
+            - name: MAAS_INTERNAL_PROXY_PORT
+              value: {{ .Values.network.port.service_proxy }}
             - name: MAAS_HTTP_BOOT
               value: {{ .Values.conf.maas.http_boot | quote }}
             - name: MAAS_NTP_SERVERS
diff --git a/charts/maas/templates/service-region.yaml b/charts/maas/templates/service-region.yaml
index 25d6336..646a0c6 100644
--- a/charts/maas/templates/service-region.yaml
+++ b/charts/maas/templates/service-region.yaml
@@ -30,9 +30,9 @@ spec:
     nodePort: {{ .Values.network.gui.node_port.port }}
     {{ end }}
   - port: {{ .Values.network.port.service_proxy }}
-    targetPort: {{ .Values.network.port.service_proxy_target }}
+    targetPort: {{ .Values.network.port.service_proxy }}
     {{ if .Values.network.proxy.node_port.enabled }}
-    nodePort:  {{ .Values.network.proxy.node_port.port }}
+    nodePort:  {{ .Values.network.port.service_proxy }}
     {{ end }}
     name: proxy
   selector:
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 63708b3..f2cd3b0 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -105,8 +105,6 @@ network:
   proxy:
     node_port:
       enabled: true
-      # Do not change the port, hardcoded in MAAS source
-      port: 31800
   gui:
     node_port:
       enabled: true
@@ -115,8 +113,7 @@ network:
     region_container: 80
     service_gui: 80
     service_gui_target: 80
-    service_proxy: 8000
-    service_proxy_target: 8000
+    service_proxy: 31800
     db_service: 5432
     db_service_target: 5432
 
diff --git a/images/maas-region-controller/2.3_proxy_port.patch b/images/maas-region-controller/2.3_proxy_port.patch
deleted file mode 100644
index 89f98b7..0000000
--- a/images/maas-region-controller/2.3_proxy_port.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/maasserver/compose_preseed.py b/src/maasserver/compose_preseed.py
-index f24b10f..f030469 100644
---- a/src/maasserver/compose_preseed.py
-+++ b/src/maasserver/compose_preseed.py
-@@ -8,7 +8,7 @@ __all__ = [
-     ]
-
- from datetime import timedelta
--from urllib.parse import urlencode
-+from urllib.parse import urlencode, urlparse
-
- from maasserver.clusterrpc.osystems import get_preseed_data
- from maasserver.enum import (
-@@ -17,6 +17,7 @@ from maasserver.enum import (
-     PRESEED_TYPE,
- )
- from maasserver.models import PackageRepository
-+from maasserver.config import RegionConfiguration
- from maasserver.models.config import Config
- from maasserver.server_address import get_maas_facing_server_host
- from maasserver.utils import absolute_reverse
-@@ -43,11 +44,11 @@ def get_apt_proxy(rack_controller=None, default_region_ip=None):
-         else:
-             maas_proxy_port = Config.objects.get_config("maas_proxy_port")
-             if not maas_proxy_port:
--                maas_proxy_port = 8000
-+                maas_proxy_port = 31800
-             url = "http://:%d/" % maas_proxy_port
--            return compose_URL(
--                url, get_maas_facing_server_host(
--                    rack_controller, default_region_ip=default_region_ip))
-+            with RegionConfiguration.open() as config:
-+                maas_url = config.maas_url
-+            return compose_URL(url, urlparse(maas_url).hostname)
-     else:
-         return None
diff --git a/images/maas-region-controller/Dockerfile b/images/maas-region-controller/Dockerfile
index e57b76f..2da446c 100644
--- a/images/maas-region-controller/Dockerfile
+++ b/images/maas-region-controller/Dockerfile
@@ -54,12 +54,10 @@ RUN apt-get download maas-region-controller=$MAAS_VERSION && \
     pg_dropcluster --stop 9.5 main
 
 # 2.3 workarounds
-COPY 2.3_proxy_port.patch /tmp/2.3_proxy_port.patch
 COPY 2.3_route.patch /tmp/2.3_route.patch
 COPY 2.3_kernel_package.patch /tmp/2.3_kernel_package.patch
 COPY 2.3_bios_grub_partition.patch /tmp/2.3_bios_grub_partition.patch
 COPY 2.3_bios_grub_preseed.patch /tmp/2.3_bios_grub_preseed.patch
-RUN cd /usr/lib/python3/dist-packages/maasserver && patch compose_preseed.py < /tmp/2.3_proxy_port.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
 RUN cd /usr/lib/python3/dist-packages/maasserver/models && patch partition.py < /tmp/2.3_bios_grub_partition.patch