diff --git a/ansible/install.yml b/ansible/install.yml
index d24960eda..871c0063d 100644
--- a/ansible/install.yml
+++ b/ansible/install.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   any_errors_fatal: "{{validators | bool | default(true)}}"
   roles:
     - install
diff --git a/ansible/reset.yml b/ansible/reset.yml
index 05845eba0..d18075062 100644
--- a/ansible/reset.yml
+++ b/ansible/reset.yml
@@ -1,6 +1,6 @@
 ---
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   become: yes
   roles:
   - stop
diff --git a/ansible/restart.yml b/ansible/restart.yml
index 7ff755f21..6690a41f6 100644
--- a/ansible/restart.yml
+++ b/ansible/restart.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   roles:
     - stop
     - start
diff --git a/ansible/roles/config/templates/config.toml.j2 b/ansible/roles/config/templates/config.toml.j2
index ba4c19596..41aa2fb23 100644
--- a/ansible/roles/config/templates/config.toml.j2
+++ b/ansible/roles/config/templates/config.toml.j2
@@ -13,7 +13,7 @@ laddr = "tcp://0.0.0.0:46657"
 [p2p]
 laddr = "tcp://0.0.0.0:46656"
 {% if validators == true or validators == 'true' %}
-{% set comma = joiner(",") %}seeds = "{% for host in ((groups[testnet_name]|default([]))+(groups['tag_Environment_'~testnet_name]|default([])))|difference(inventory_hostname) %}{{ comma() }}{{hostvars[host]["inventory_hostname"]}}:46656{% endfor %}"
+{% set comma = joiner(",") %}seeds = "{% for host in ((groups[testnet_name]|default([]))+(groups['tag_Environment_'~(testnet_name|regex_replace('-','_'))]|default([])))|difference(inventory_hostname) %}{{ comma() }}{{hostvars[host]["inventory_hostname"]}}:46656{% endfor %}"
 {% else %}
 seeds = "{{ seeds | default() }}"
 {% endif %}
diff --git a/ansible/roles/config/templates/genesis-server.json.j2 b/ansible/roles/config/templates/genesis-server.json.j2
index 5c693eeba..e41c98a0c 100644
--- a/ansible/roles/config/templates/genesis-server.json.j2
+++ b/ansible/roles/config/templates/genesis-server.json.j2
@@ -5,7 +5,7 @@
   [
 {% if (validators == true) or (validators == 'true') %}
 {% set comma = joiner(",") %}
-{% for host in (groups[testnet_name]|default([]))+(groups['tag_Environment_'~testnet_name]|default([])) %}
+{% for host in (groups[testnet_name]|default([]))+(groups['tag_Environment_'~(testnet_name|regex_replace('-','_'))]|default([])) %}
     {{ comma() }}
     {
       "pub_key": {
diff --git a/ansible/start.yml b/ansible/start.yml
index 92ade42fd..699c7052b 100644
--- a/ansible/start.yml
+++ b/ansible/start.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   roles:
     - start
 
diff --git a/ansible/status.yml b/ansible/status.yml
index 738c23b98..2839f0563 100644
--- a/ansible/status.yml
+++ b/ansible/status.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   roles:
     - status
 
diff --git a/ansible/stop.yml b/ansible/stop.yml
index f0050e065..f89e3cf22 100644
--- a/ansible/stop.yml
+++ b/ansible/stop.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   roles:
     - stop
 
diff --git a/ansible/ubuntu16-patch.yml b/ansible/ubuntu16-patch.yml
index a8ba935d6..89c8864d0 100644
--- a/ansible/ubuntu16-patch.yml
+++ b/ansible/ubuntu16-patch.yml
@@ -1,7 +1,7 @@
 ---
 #Ubuntu 16.04 is not installing the python package in the standard installation on DigitalOcean. This "patch" will install it so the rest of the ansible playbooks can work properly.
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   gather_facts: no
   tasks:
   - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal)
diff --git a/ansible/upgrade-reset.yml b/ansible/upgrade-reset.yml
index 97b76f96e..58688f7ce 100644
--- a/ansible/upgrade-reset.yml
+++ b/ansible/upgrade-reset.yml
@@ -2,7 +2,7 @@
 
 #variable "service" is required
 
-- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
   roles:
     - stop
     - install