diff --git a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
index 2138f98dc9d9116ffc7279b962daac7ee1f7ab98..ad4d8489522b09ea5099f238a8ef631c6a9f0c96 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
@@ -40,8 +40,8 @@
 
 - name: Set short router names for local and remote sides
   ansible.builtin.set_fact:
-    local_side_short_name: '{{ local_side.iptrunk_side_node.router_fqdn | replace(postfix_to_remove, "") }}'
-    remote_side_short_name: '{{ remote_side.iptrunk_side_node.router_fqdn | replace(postfix_to_remove, "") }}'
+    local_side_short_name: '{{ local_side.iptrunk_side_node.router_fqdn | replace(domain_name_regex, "") }}'
+    remote_side_short_name: '{{ remote_side.iptrunk_side_node.router_fqdn | replace(domain_name_regex, "") }}'
 
 - name: Set Local and Remote side IPv4 addresses nodeA
   ansible.builtin.set_fact:
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
index 1b39b11247a0151100bc918b329aff7e93616514..ace9a7ac4a9f5463a660c58e4064c2e2a8d56605 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
@@ -5,7 +5,6 @@
 
 dry_run: "True"
 
-postfix_to_remove: ".dev.geant.private"
 
 nokia_twamp_server:
   max_conn: 1