diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml
index 6797149..8e8ebe4 100644
--- a/charts/matrix-synapse/templates/ingress.yaml
+++ b/charts/matrix-synapse/templates/ingress.yaml
@@ -139,11 +139,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Prefix
           {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
           {{- end }}
         {{- end }}
 
@@ -154,11 +154,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Prefix
           {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
           {{- end }}
         {{- end }}
 
@@ -195,11 +195,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Exact
             {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
             {{- end }}
           {{- end }}
         {{- end }}
diff --git a/charts/matrix-synapse/templates/tests/test-connection.yaml b/charts/matrix-synapse/templates/tests/test-connection.yaml
index b53f310..466e954 100644
--- a/charts/matrix-synapse/templates/tests/test-connection.yaml
+++ b/charts/matrix-synapse/templates/tests/test-connection.yaml
@@ -12,5 +12,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args:  ['{{ include "matrix-synapse.fullname" . }}:8008/_matrix/client/versions']
+      args:  ['{{ include "matrix-synapse.fullname" . }}:{{ $.Values.service.port }}/_matrix/client/versions']
   restartPolicy: Never
diff --git a/charts/matrix-synapse/templates/worker-configuration.yaml b/charts/matrix-synapse/templates/worker-configuration.yaml
index accc7b9..e0067fa 100644
--- a/charts/matrix-synapse/templates/worker-configuration.yaml
+++ b/charts/matrix-synapse/templates/worker-configuration.yaml
@@ -29,7 +29,7 @@ data:
     worker_name: {{ $config.name }}
 {{- end }}
 
-    worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:8008
+    worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:{{ $.Values.service.port }}
     worker_replication_host: {{ include "matrix-synapse.replicationname" $ | quote }}
     worker_replication_http_port: 9093