diff --git a/vars/rabbitmq_vhost.yml b/vars/rabbitmq_vhost.yml
index a32e14b..68d3327 100644
--- a/vars/rabbitmq_vhost.yml
+++ b/vars/rabbitmq_vhost.yml
@@ -10,14 +10,14 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
       - name: pubsub_sweeper
         apply_to: queues
         state: present
         pattern: ".*"
         tags:
-          expires: '111600000'
-          max-length-bytes: '1073741824'
+          expires: 111600000
+          max-length-bytes: 1073741824
   - vhost: '/public_pubsub'
     state: present
     policy:
@@ -26,8 +26,8 @@ rabbitmq_vhosts:
         state: present
         pattern: ".*"
         tags:
-          expires: '3600000'
-          max-length-bytes: '52428800'
+          expires: 3600000
+          max-length-bytes: 52428800
   - vhost: mbs
     state: present
     policy:
@@ -38,7 +38,7 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
   - vhost: distrobuild
     state: present
     policy:
@@ -49,7 +49,7 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
   - vhost: odcs
     state: present
     policy:
@@ -60,14 +60,14 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
       - name: pubsub_sweeper
         apply_to: queues
         state: present
         pattern: ".*"
         tags:
-          expires: '111600000'
-          max-length-bytes: '1073741824'
+          expires: 111600000
+          max-length-bytes: 1073741824
   # Legacy entries
   - vhost: pubsub
     state: present
@@ -79,14 +79,14 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
       - name: pubsub_sweeper
         apply_to: queues
         state: present
         pattern: ".*"
         tags:
-          expires: '111600000'
-          max-length-bytes: '1073741824'
+          expires: 111600000
+          max-length-bytes: 1073741824
   - vhost: public_pubsub
     state: present
     policy:
@@ -95,8 +95,8 @@ rabbitmq_vhosts:
         state: present
         pattern: ".*"
         tags:
-          expires: '3600000'
-          max-length-bytes: '52428800'
+          expires: 3600000
+          max-length-bytes: 52428800
   - vhost: '/mbs'
     state: present
     policy:
@@ -107,5 +107,5 @@ rabbitmq_vhosts:
         tags:
           ha-mode: 'all'
           ha-sync-mode: 'automatic'
-          ha-sync-batch-size: '10000'
+          ha-sync-batch-size: 10000
 ...