diff --git a/tripleo_ansible/ansible_plugins/action/tripleo_all_nodes_data.py b/tripleo_ansible/ansible_plugins/action/tripleo_all_nodes_data.py
index ea61295da..30634ae40 100644
--- a/tripleo_ansible/ansible_plugins/action/tripleo_all_nodes_data.py
+++ b/tripleo_ansible/ansible_plugins/action/tripleo_all_nodes_data.py
@@ -46,7 +46,10 @@ import traceback
 
 from ansible.errors import AnsibleError
 from ansible.plugins.action import ActionBase
-from ansible.plugins.filter import ipaddr
+try:
+    from ansible_collections.ansible.netcommon.plugins.filter import ipaddr
+except ImportError:
+    from ansible.plugins.filter import ipaddr
 from ansible.utils.display import Display
 
 
diff --git a/tripleo_ansible/ansible_plugins/action/tripleo_iptables.py b/tripleo_ansible/ansible_plugins/action/tripleo_iptables.py
index 24ec70f7d..0512845f2 100644
--- a/tripleo_ansible/ansible_plugins/action/tripleo_iptables.py
+++ b/tripleo_ansible/ansible_plugins/action/tripleo_iptables.py
@@ -50,7 +50,10 @@ EXAMPLES = """
 
 
 from ansible.plugins.action import ActionBase
-from ansible.plugins.filter import ipaddr
+try:
+    from ansible_collections.ansible.netcommon.plugins.filter import ipaddr
+except ImportError:
+    from ansible.plugins.filter import ipaddr
 from ansible.utils.display import Display