diff --git a/inventory/group_vars/badges-backend b/inventory/group_vars/badges-backend
index 023e0bcebc..0a11a86b33 100644
--- a/inventory/group_vars/badges-backend
+++ b/inventory/group_vars/badges-backend
@@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
 fedmsg_error_recipients:
 - sysadmin-badges-members@fedoraproject.org
 
-fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
+fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/inventory/group_vars/badges-backend-stg b/inventory/group_vars/badges-backend-stg
index 1ab5c48579..b76ce0de4b 100644
--- a/inventory/group_vars/badges-backend-stg
+++ b/inventory/group_vars/badges-backend-stg
@@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
 fedmsg_error_recipients:
 - sysadmin-badges-members@fedoraproject.org
 
-fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
+fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/inventory/group_vars/odcs-backend b/inventory/group_vars/odcs-backend
index 37ed935cb1..ade5de1b9a 100644
--- a/inventory/group_vars/odcs-backend
+++ b/inventory/group_vars/odcs-backend
@@ -33,7 +33,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '
 
 fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
 
-fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
+fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/inventory/group_vars/odcs-backend-stg b/inventory/group_vars/odcs-backend-stg
index cd34d346db..3e382938e2 100644
--- a/inventory/group_vars/odcs-backend-stg
+++ b/inventory/group_vars/odcs-backend-stg
@@ -35,7 +35,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '
 
 fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
 
-fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
+fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/roles/fedmsg/hub/templates/fedmsg-hub-systemd.conf.j2 b/roles/fedmsg/hub/templates/fedmsg-hub-systemd.conf.j2
index 8578801d92..45f6b90d3d 100644
--- a/roles/fedmsg/hub/templates/fedmsg-hub-systemd.conf.j2
+++ b/roles/fedmsg/hub/templates/fedmsg-hub-systemd.conf.j2
@@ -1,5 +1,5 @@
 [Service]
-{% if fedmsg_hub_memory_limit_mb %}
+{% if fedmsg_hub_memory_limit_mb|int %}
 # Limit max RAM usage for fedmsg-hub.  Also don't let fedmsg-hub use
 # more that half of swap available in the system, so that we don't get
 # Nagios alerts about low swap.  We would rather have fedmsg-hub OOM
@@ -9,7 +9,7 @@ MemorySwapMax={{ (ansible_memory_mb.swap.total / 2) | int }}M
 MemoryMax={{fedmsg_hub_memory_limit_mb}}M
 {% else %}
 MemoryLimit={{fedmsg_hub_memory_limit_mb}}M
-LimitAS={{ (fedmsg_hub_memory_limit_mb + (ansible_memory_mb.swap.total / 2)) | int }}M
+LimitAS={{ (fedmsg_hub_memory_limit_mb|int + (ansible_memory_mb.swap.total / 2)) | int }}M
 {% endif %}
 {% endif %}