diff --git a/geant/gap_ansible/playbooks/base_config.yaml b/geant/gap_ansible/playbooks/base_config.yaml
index 4f0ae33eb2784dbff9e82618df3bcc251b9c7cf3..1b1a57431e1b4a3b3d279bc7eca15ceeebc8a6f6 100644
--- a/geant/gap_ansible/playbooks/base_config.yaml
+++ b/geant/gap_ansible/playbooks/base_config.yaml
@@ -1,8 +1,6 @@
 - name: Manage base config playbook
   hosts: all
   gather_facts: false
-  # remote_user: admin
-  # remote_user: geant-gap-test
   roles:
     - Juniper.junos
     - ../roles/base_config
diff --git a/geant/gap_ansible/playbooks/base_config_checks.yaml b/geant/gap_ansible/playbooks/base_config_checks.yaml
index a00837e86c2705a0b139a1957197f1b904d8af21..8ee3838b790298a0dacb5c2f77165795388bbb9b 100644
--- a/geant/gap_ansible/playbooks/base_config_checks.yaml
+++ b/geant/gap_ansible/playbooks/base_config_checks.yaml
@@ -2,7 +2,5 @@
   hosts: all
   connection: netconf
   gather_facts: false
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   roles:
     - ../roles/base_config_checks
diff --git a/geant/gap_ansible/playbooks/check_ibgp.yaml b/geant/gap_ansible/playbooks/check_ibgp.yaml
index 53b384096c74f1cb97e0fb9cee9577e29d963507..9f85b5e9f33c7a7713aa3d7e3f2e4d675d8a2dbd 100644
--- a/geant/gap_ansible/playbooks/check_ibgp.yaml
+++ b/geant/gap_ansible/playbooks/check_ibgp.yaml
@@ -1,7 +1,5 @@
 - name: Check iBGP status on P
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos
diff --git a/geant/gap_ansible/playbooks/iptrunks.yaml b/geant/gap_ansible/playbooks/iptrunks.yaml
index f93ca1b669e87f15b1b9c42fab16cd612017072e..fca1ae980625ce82a84f47d68a1b4c8d5107aad9 100644
--- a/geant/gap_ansible/playbooks/iptrunks.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks.yaml
@@ -1,7 +1,5 @@
 - name: Manage iptrunks playbook
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  # remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos
diff --git a/geant/gap_ansible/playbooks/iptrunks_checks.yaml b/geant/gap_ansible/playbooks/iptrunks_checks.yaml
index bc134eb7b5fc45aa2f2e6e5d8b7e9deb41682a37..b171eec5914583422ddbd7fdf22767ec07069e27 100644
--- a/geant/gap_ansible/playbooks/iptrunks_checks.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks_checks.yaml
@@ -1,7 +1,5 @@
 - name: Manage iptrunks checks playbook
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  # remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos
diff --git a/geant/gap_ansible/playbooks/iptrunks_migration.yaml b/geant/gap_ansible/playbooks/iptrunks_migration.yaml
index e6b61639f9f27d1e1156f059e2480b622f1270f8..6943bd7baa114493c008788d58eef7a61be55d8d 100644
--- a/geant/gap_ansible/playbooks/iptrunks_migration.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks_migration.yaml
@@ -1,7 +1,5 @@
 - name: Manage iptrunks migration
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos
diff --git a/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml b/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
index 73599f7a91a4eb0439f407cfce86c69d5fbc65a4..947dcc2780667cbce2a3f2db7621c4886e8662b5 100644
--- a/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
+++ b/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
@@ -1,7 +1,5 @@
 - name: Manage iBGP mesh
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos