diff --git a/float b/float
index f4a6fb2321daa1c74fb01c1b01939e0f8390b8ad..450b4580cda1480d6f4e0ad064cdcfc062138269 100755
--- a/float
+++ b/float
@@ -185,7 +185,7 @@ DEFAULT_VARS = {
 
             'nocows': 1,
             'display_skipped_hosts': False,
-            'callback_whitelist': 'float_ci',
+            'callbacks_enabled': 'float_ci',
             'stdout_callback': 'float_ci',
             'host_key_checking': False,
             'forks': 50,
diff --git a/roles/float-base-net-overlay/templates/firewall/11net-overlay-raw.j2 b/roles/float-base-net-overlay/templates/firewall/11net-overlay-raw.j2
index 452634320c0a42ca8e8ab925c0f2ea85705a4f3c..b8fb718ded92332f92ca809ac949aa39478538f9 100644
--- a/roles/float-base-net-overlay/templates/firewall/11net-overlay-raw.j2
+++ b/roles/float-base-net-overlay/templates/firewall/11net-overlay-raw.j2
@@ -1,8 +1,8 @@
 {% macro allow_host_ips(h, chain) %}
-{% for ip in hostvars[h]['ips'] | ansible.netcommon.ipv4 | sort %}
+{% for ip in hostvars[h]['ips'] | ansible.utils.ipv4 | sort %}
 add_rule4 -A {{ chain }} -s {{ ip }} -j CT --notrack
 {% endfor %}
-{% for ip in hostvars[h]['ips'] | ansible.netcommon.ipv6 | sort %}
+{% for ip in hostvars[h]['ips'] | ansible.utils.ipv6 | sort %}
 add_rule6 -A {{ chain }} -s {{ ip }} -j CT --notrack
 {% endfor %}
 {% endmacro %}
diff --git a/roles/float-base/templates/firewall/10float.j2 b/roles/float-base/templates/firewall/10float.j2
index e8888a411fd3b65bc3ed73167d94207f228b7b40..48c889439e22b5cf01e5f0bfd3c31776769d4383 100644
--- a/roles/float-base/templates/firewall/10float.j2
+++ b/roles/float-base/templates/firewall/10float.j2
@@ -2,10 +2,10 @@
 # specific sets of hosts.
 
 {% macro allow_host_ips(h, chain) %}
-{% for ip in hostvars[h]['ips'] | ansible.netcommon.ipv4 | sort %}
+{% for ip in hostvars[h]['ips'] | ansible.utils.ipv4 | sort %}
 add_rule4 -A {{ chain }} -s {{ ip }} -j ACCEPT
 {% endfor %}
-{% for ip in hostvars[h]['ips'] | ansible.netcommon.ipv6 | sort %}
+{% for ip in hostvars[h]['ips'] | ansible.utils.ipv6 | sort %}
 add_rule6 -A {{ chain }} -s {{ ip }} -j ACCEPT
 {% endfor %}
 {% endmacro %}
diff --git a/roles/float-infra-dns/templates/bind/named.conf.options b/roles/float-infra-dns/templates/bind/named.conf.options
index fb34501e6e02e674010df011619797faa4e30d86..906f1094fbd8e58e10cb6ed9dc765e561875d21b 100644
--- a/roles/float-infra-dns/templates/bind/named.conf.options
+++ b/roles/float-infra-dns/templates/bind/named.conf.options
@@ -10,7 +10,7 @@ options {
 {% if float_limit_bind_to_known_interfaces | default(False) %}
   listen-on {
     127.0.0.1;
-{% for ip in ips | ansible.netcommon.ipv4 | sort %}
+{% for ip in ips | ansible.utils.ipv4 | sort %}
     {{ ip }};
 {% endfor %}
 {% for n in net_overlays | sort if ('ip_' + n.name) in hostvars[inventory_hostname] %}
@@ -19,7 +19,7 @@ options {
   };
   listen-on-v6 {
     ::1;
-{% for ip in ips | ansible.netcommon.ipv6 | sort %}
+{% for ip in ips | ansible.utils.ipv6 | sort %}
     {{ ip }};
 {% endfor %}
   };
diff --git a/roles/float-infra-dns/templates/dns/infra.yml b/roles/float-infra-dns/templates/dns/infra.yml
index b104d31b015760e47ed5cb5d58929b3476b23e58..8591f01e0a05da8c901c9f30f6dcb62beb713948 100644
--- a/roles/float-infra-dns/templates/dns/infra.yml
+++ b/roles/float-infra-dns/templates/dns/infra.yml
@@ -3,8 +3,8 @@
 "@ns":
   _:
 {% for h in services['dns'].hosts | sort %}
-{% set host_ip4 = hostvars[h]['public_ips'] | ansible.netcommon.ipv4 %}
-{% set host_ip6 = hostvars[h]['public_ips'] | ansible.netcommon.ipv6 %}
+{% set host_ip4 = hostvars[h]['public_ips'] | ansible.utils.ipv4 %}
+{% set host_ip6 = hostvars[h]['public_ips'] | ansible.utils.ipv6 %}
 {% if host_ip4 %}
     - NS ns{{ loop.index }}.{{ mx_ns_domain }}.
 {% endif %}
@@ -32,8 +32,8 @@
   # The explicit NS delegation for 'l' is necessary for dnssec-sign to work properly.
   l:
 {% for h in services['dns'].hosts | sort %}
-{% set host_ip4 = hostvars[h]['public_ips'] | ansible.netcommon.ipv4 %}
-{% set host_ip6 = hostvars[h]['public_ips'] | ansible.netcommon.ipv6 %}
+{% set host_ip4 = hostvars[h]['public_ips'] | ansible.utils.ipv4 %}
+{% set host_ip6 = hostvars[h]['public_ips'] | ansible.utils.ipv6 %}
 {% if host_ip4 %}
     - NS ns{{ loop.index }}.{{ mx_ns_domain }}.
 {% endif %}
@@ -45,8 +45,8 @@
 {% if d == mx_ns_domain %}
 {# Only generate the nameservers' A records on the chosen zone #}
 {% for h in services['dns'].hosts | sort %}
-{% set host_ip4 = hostvars[h]['public_ips'] | ansible.netcommon.ipv4 %}
-{% set host_ip6 = hostvars[h]['public_ips'] | ansible.netcommon.ipv6 %}
+{% set host_ip4 = hostvars[h]['public_ips'] | ansible.utils.ipv4 %}
+{% set host_ip6 = hostvars[h]['public_ips'] | ansible.utils.ipv6 %}
 {% if host_ip4 %}
   ns{{ loop.index }}: {{ host_ip4 | to_json }}
 {% endif %}
diff --git a/roles/float-infra-dns/templates/zonetool.yml b/roles/float-infra-dns/templates/zonetool.yml
index 4f6fcbd0f9dda3e6d923674fda61c42f9897d118..b80c198db76d825105e784fd227b7b2432824d10 100644
--- a/roles/float-infra-dns/templates/zonetool.yml
+++ b/roles/float-infra-dns/templates/zonetool.yml
@@ -1,6 +1,6 @@
 ---
 {% set all_ips = services['frontend'].hosts | map('extract', hostvars) | rejectattr('traffic', 'false') | map(attribute='public_ips') | reject('undefined') | flatten %}
 
-FRONTENDS4: {{ all_ips | ansible.netcommon.ipv4 | list | to_json }}
+FRONTENDS4: {{ all_ips | ansible.utils.ipv4 | list | to_json }}
 
-FRONTENDS6: {{ all_ips | ansible.netcommon.ipv6 | list | to_json }}
+FRONTENDS6: {{ all_ips | ansible.utils.ipv6 | list | to_json }}
diff --git a/test-driver b/test-driver
index dcef19c1e9b09cc4b2de992c29d23554bf26fd0a..863c71768276eac96af1cb3d2487981c076bf6ff 100755
--- a/test-driver
+++ b/test-driver
@@ -56,7 +56,7 @@ save_logs() {
     log "Saving logs from VMs (if any)"
     mkdir -p "${out_dir}"
     ANSIBLE_STDOUT_CALLBACK=null \
-    ${float_dir}/float run -e "callback_whitelist=" -e "out_dir=${out_dir}" \
+    ${float_dir}/float run -e "callbacks_enabled=" -e "out_dir=${out_dir}" \
         ${float_dir}/test/save-logs.yml
 }