diff --git a/roles/custom/matrix-ntfy/defaults/main.yml b/roles/custom/matrix-ntfy/defaults/main.yml
index dc3b425b0..a5cb6d986 100644
--- a/roles/custom/matrix-ntfy/defaults/main.yml
+++ b/roles/custom/matrix-ntfy/defaults/main.yml
@@ -15,11 +15,13 @@ matrix_ntfy_docker_image_force_pull: "{{ matrix_ntfy_docker_image.endswith(':lat
 matrix_ntfy_base_url: "https://{{ matrix_server_fqn_ntfy }}"
 
 # Rate limits
-matrix_ntfy_limit_burst_rate: 60 # default
-matrix_ntfy_limit_replenish_rate: "5s" # default
-matrix_ntfy_limit_rate_exempt: "{{matrix_server_fqn_matrix}},localhost" # exempt our matrix server from rate limits, this may not work when the homeserver's outgoing IP is different from the incoming IP, but most small deployments should be fine.
-matrix_ntfy_limit_global_topic: 15000 # default
-matrix_ntfy_limit_visitor_subscriptions: 30 # default
+
+matrix_ntfy_global_topic_limit: 15000 # default
+matrix_ntfy_visitor_subscription_limit: 30 # default
+matrix_ntfy_visitor_request_limit_burst: 60 # default
+matrix_ntfy_visitor_request_limit_replenish: "5s" # default
+matrix_ntfy_visitor_request_limit_exempt_hosts: "{{matrix_server_fqn_matrix}},localhost" # exempt our matrix server from rate limits, this may not work when the homeserver's outgoing IP is different from the incoming IP, but most small deployments should be fine.
+
 
 # Controls whether the container exposes its HTTP port (tcp/80 in the container).
 #
diff --git a/roles/custom/matrix-ntfy/templates/ntfy/server.yml.j2 b/roles/custom/matrix-ntfy/templates/ntfy/server.yml.j2
index 030d45ba4..833ddd61b 100644
--- a/roles/custom/matrix-ntfy/templates/ntfy/server.yml.j2
+++ b/roles/custom/matrix-ntfy/templates/ntfy/server.yml.j2
@@ -4,9 +4,9 @@ cache_file: /data/cache.db
 listen-http: :8080
 
 # Rate Limits
-global-topic-limit: {{ matrix_ntfy_limit_global_topic }}
-visitor-subscription-limit: {{ matrix_ntfy_limit_visitor_subscriptions }}
+global-topic-limit: {{ matrix_ntfy_global_topic_limit | to_json }}
+visitor-subscription-limit: {{ matrix_ntfy_visitor_subscription_limit | to_json }}
 
-visitor-request-limit-burst: {{ matrix_ntfy_limit_burst_rate }}
-visitor-request-limit-replenish: "{{ matrix_ntfy_limit_replenish_rate }}"
-visitor-request-limit-exempt-hosts: "{{ matrix_ntfy_limit_rate_exempt }}"
+visitor-request-limit-burst: {{ matrix_ntfy_visitor_request_limit_burst | to_json }}
+visitor-request-limit-replenish: "{{ matrix_ntfy_visitor_request_limit_replenish | to_json }}"
+visitor-request-limit-exempt-hosts: "{{ matrix_ntfy_visitor_request_limit_exempt_hosts | to_json }}"