diff --git a/geant/gap_ansible/playbooks/base_config.yaml b/geant/gap_ansible/playbooks/base_config.yaml
index 4f0ae33eb2784dbff9e82618df3bcc251b9c7cf3..aeb77e0d9ba0ef68ca292cd4c41f38b4b7305698 100644
--- a/geant/gap_ansible/playbooks/base_config.yaml
+++ b/geant/gap_ansible/playbooks/base_config.yaml
@@ -1,8 +1,7 @@
 - name: Manage base config playbook
   hosts: all
   gather_facts: false
-  # remote_user: admin
-  # remote_user: geant-gap-test
+  collections:
+    - geant.gap_ansible
   roles:
-    - Juniper.junos
     - ../roles/base_config
diff --git a/geant/gap_ansible/playbooks/check_ibgp.yaml b/geant/gap_ansible/playbooks/check_ibgp.yaml
index 9f85b5e9f33c7a7713aa3d7e3f2e4d675d8a2dbd..796897eb42dbc7a03a09be002573f51cbc95b9f6 100644
--- a/geant/gap_ansible/playbooks/check_ibgp.yaml
+++ b/geant/gap_ansible/playbooks/check_ibgp.yaml
@@ -2,7 +2,6 @@
   hosts: all
   gather_facts: false
   roles:
-    - Juniper.junos
     - ../roles/ibgp_update
   vars:
     verb: 'check_p_ibgp'
diff --git a/geant/gap_ansible/playbooks/iptrunks.yaml b/geant/gap_ansible/playbooks/iptrunks.yaml
index f93ca1b669e87f15b1b9c42fab16cd612017072e..e31c1502fe67b368c9bd92c5fb150976913938e1 100644
--- a/geant/gap_ansible/playbooks/iptrunks.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks.yaml
@@ -1,8 +1,7 @@
 - name: Manage iptrunks playbook
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  # remote_user: geant-ne-na-lab
   gather_facts: false
+  collections:
+    - geant.gap_ansible
   roles:
-    - Juniper.junos
     - ../roles/iptrunk
diff --git a/geant/gap_ansible/playbooks/iptrunks_checks.yaml b/geant/gap_ansible/playbooks/iptrunks_checks.yaml
index b171eec5914583422ddbd7fdf22767ec07069e27..1ffc1562f0f2436d44e11abfaacce77fb0841872 100644
--- a/geant/gap_ansible/playbooks/iptrunks_checks.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks_checks.yaml
@@ -1,6 +1,7 @@
 - name: Manage iptrunks checks playbook
   hosts: all
   gather_facts: false
+  collections:
+    - geant.gap_ansible
   roles:
-    - Juniper.junos
     - ../roles/iptrunk_checks
diff --git a/geant/gap_ansible/playbooks/iptrunks_migration.yaml b/geant/gap_ansible/playbooks/iptrunks_migration.yaml
index 6943bd7baa114493c008788d58eef7a61be55d8d..edfd35f23304c642140feb03b13026699a26f625 100644
--- a/geant/gap_ansible/playbooks/iptrunks_migration.yaml
+++ b/geant/gap_ansible/playbooks/iptrunks_migration.yaml
@@ -1,6 +1,7 @@
 - name: Manage iptrunks migration
   hosts: all
   gather_facts: false
+  collections:
+    - geant.gap_ansible
   roles:
-    - Juniper.junos
     - ../roles/iptrunk_migration
diff --git a/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml b/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
index 947dcc2780667cbce2a3f2db7621c4886e8662b5..ce6b41ee939d53a0e92f6435c479c3669e002df1 100644
--- a/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
+++ b/geant/gap_ansible/playbooks/update_ibgp_mesh.yaml
@@ -1,6 +1,7 @@
 - name: Manage iBGP mesh
   hosts: all
   gather_facts: false
+  collections:
+    - geant.gap_ansible
   roles:
-    - Juniper.junos
     - ../roles/ibgp_update