diff --git a/facts.yml b/facts.yml
index a599f1371..e0281ee40 100644
--- a/facts.yml
+++ b/facts.yml
@@ -7,15 +7,20 @@
       setup:
         gather_subset: '!all'
 
-    - name: Gather necessary facts
+    # filter match the following variables:
+    # ansible_default_ipv4
+    # ansible_default_ipv6
+    # ansible_all_ipv4_addresses
+    # ansible_all_ipv6_addresses
+    - name: Gather necessary facts (network)
       setup:
-        gather_subset: '!all,!min,network,hardware'
-        filter: "{{ item }}"
-      loop:
-        - ansible_distribution_major_version
-        - ansible_default_ipv4
-        - ansible_default_ipv6
-        - ansible_all_ipv4_addresses
-        - ansible_all_ipv6_addresses
-        - ansible_memtotal_mb
-        - ansible_swaptotal_mb
+        gather_subset: '!all,!min,network'
+        filter: "ansible_*_ipv[46]*"
+
+    # filter match the following variables:
+    # ansible_memtotal_mb
+    # ansible_swaptotal_mb
+    - name: Gather necessary facts (hardware)
+      setup:
+        gather_subset: '!all,!min,hardware'
+        filter: "ansible_*total_mb"