diff --git a/roles/custom/matrix-jwt-service/defaults/main.yml b/roles/custom/matrix-jwt-service/defaults/main.yml
index eef19f621..3496e55db 100644
--- a/roles/custom/matrix-jwt-service/defaults/main.yml
+++ b/roles/custom/matrix-jwt-service/defaults/main.yml
@@ -7,7 +7,7 @@ matrix_jwt_service_base_path: "{{ matrix_base_data_path }}/jwt-service"
 
 # Docker network configuration
 matrix_jwt_service_container_network: ''
-matrix_jwt_service_container_http_host_bind_port: '8881'
+matrix_jwt_service_container_http_host_bind_port: ''
 matrix_jwt_service_container_additional_networks: []  # No additional networks by default
 
 # Docker images
diff --git a/roles/custom/matrix-jwt-service/templates/labels.j2 b/roles/custom/matrix-jwt-service/templates/labels.j2
index 62e2755ce..b547e1952 100644
--- a/roles/custom/matrix-jwt-service/templates/labels.j2
+++ b/roles/custom/matrix-jwt-service/templates/labels.j2
@@ -6,7 +6,7 @@ traefik.enable=true
 traefik.docker.network={{ matrix_jwt_service_container_labels_traefik_docker_network }}
 {% endif %}
 
-traefik.http.services.matrix-jwt-service.loadbalancer.server.port=8881
+traefik.http.services.matrix-jwt-service.loadbalancer.server.port=8080
 
 {% set middlewares = [] %}
 
diff --git a/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 b/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2
index 07c8ef1ed..bdf36635a 100644
--- a/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2
+++ b/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2
@@ -16,7 +16,9 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
     --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
     --cap-drop=ALL \
     --network={{ matrix_jwt_service_container_network }} \
-    -p {{ matrix_jwt_service_port }}:8080 \
+    {% if matrix_jwt_service_container_http_host_bind_port %}
+    -p {{ matrix_jwt_service_container_http_host_bind_port }}:8080 \
+    {% endif %}
     --env-file={{ matrix_jwt_service_base_path }}/env \
     --label-file={{ matrix_jwt_service_base_path }}/labels \
     {{ matrix_jwt_service_image }}