diff --git a/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2 b/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
index 284720095..c9959a266 100644
--- a/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
+++ b/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
@@ -10,11 +10,11 @@ no-resolv
 
 {% for interface in network_interfaces %}
 {% if not interface.startswith('veth') and not interface.startswith('docker') and not interface.startswith('br') %}
-interface={{ interface }}
+# interface={{ interface }}
 {% endif %}
 {% endfor %}
 
-bind-interfaces
+# bind-interfaces  # This will bind only to the interfaces that are up in interface= above
 # log-dhcp
 # log-queries
 # log-facility=/var/log/dnsmasq.log
diff --git a/ansible/roles/redis/tasks/main.yml b/ansible/roles/redis/tasks/main.yml
index 99db27119..9723d67d2 100644
--- a/ansible/roles/redis/tasks/main.yml
+++ b/ansible/roles/redis/tasks/main.yml
@@ -3,6 +3,7 @@
   set_fact:
     redis_role: "{{ inventory_hostname.split('-')[2] }}"
     redis_port: 6379
+    redis_secondary: yes
     redis_secondary_ports:
       story: 6380
       user: 6381
@@ -12,7 +13,8 @@
 - name: Set redis_port for secondary redis servers
   set_fact:
     redis_port: "{{ redis_secondary_ports[redis_role] }}"
-  when: inventory_hostname in ['hdb-redis-story-2', 'hdb-redis-user-2', 'hdb-redis-session-2', 'hdb-redis-pubsub-2']
+    redis_secondary: yes
+  when: inventory_hostname not in ["db-redis-user", "db-redis-story1", "db-redis-session", "db-redis-pubsub"]
 
 - name: Install sysfsutils for disabling transparent huge pages
   become: yes
diff --git a/ansible/roles/redis/templates/consul_service.json b/ansible/roles/redis/templates/consul_service.json
index 03b736eb5..1f4741bc5 100644
--- a/ansible/roles/redis/templates/consul_service.json
+++ b/ansible/roles/redis/templates/consul_service.json
@@ -1,6 +1,6 @@
 {
     "service": {
-        {% if inventory_hostname in ["db-redis-user", "db-redis-story1", "db-redis-session", "db-redis-pubsub"] %}
+        {% if not redis_secondary %}
             "name": "{{ inventory_hostname|regex_replace('\-?\d+', '')|regex_replace("hdb", "db") }}",
         {% else %}
             "name": "db-redis-{{ redis_role }}-staging",