diff --git a/ansible/main-lab/nodes.yml b/ansible/main-lab/nodes.yml
index 7157975..3e4c871 100644
--- a/ansible/main-lab/nodes.yml
+++ b/ansible/main-lab/nodes.yml
@@ -1,5 +1,5 @@
 ---
 - name: Basic check nodes
   hosts: all
-  roles:
-    - role: common
\ No newline at end of file
+  roles: 
+    - common
\ No newline at end of file
diff --git a/ansible/main-lab/roles/common/tasks/basic-check-node.yml b/ansible/main-lab/roles/common/tasks/basic-check-node.yml
deleted file mode 100644
index a4ab550..0000000
--- a/ansible/main-lab/roles/common/tasks/basic-check-node.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Check node up
-  ansible.builtin.ping:
-
-- name: Check public network access
-  ansible.netcommon.net_ping: 
-    dest: 8.8.8.8 
diff --git a/ansible/main-lab/roles/common/tasks/connectivity.yml b/ansible/main-lab/roles/common/tasks/connectivity.yml
new file mode 100644
index 0000000..7023e5e
--- /dev/null
+++ b/ansible/main-lab/roles/common/tasks/connectivity.yml
@@ -0,0 +1,9 @@
+---
+- name: Check node up
+  ansible.builtin.ping:
+
+#- name: Check internal DNS
+#  wait_for: host=edge.home.arpa port=53 timeout=1
+
+- name: Check access to Internet
+  wait_for: host=1.1.1.1 timeout=1
diff --git a/ansible/main-lab/roles/common/tasks/main.yml b/ansible/main-lab/roles/common/tasks/main.yml
index 048646c..af4c8ba 100644
--- a/ansible/main-lab/roles/common/tasks/main.yml
+++ b/ansible/main-lab/roles/common/tasks/main.yml
@@ -1,11 +1,2 @@
 ---
-- name: Ping node
-  ansible.builtin.ping:
-
-- name: Check internal DNS
-  ansible.netcommon.net_ping: 
-    dest: edge.home.arpa
-
-- name: Check access to WAN
-  ansible.netcommon.net_ping:
-    dest: 1.1.1.1
\ No newline at end of file
+- import_tasks: connectivity.yml
\ No newline at end of file