diff --git a/manifests/init.pp b/manifests/init.pp
index e621df0..fac8cd3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,10 +54,18 @@
     default => undef,
   }
 
+  $renderer_service = $renderer ? {
+    'networkd' => 'systemd-networkd',
+    default    => $renderer,
+  }
+
+  $test_command = "while ! /bin/systemctl status ${renderer_service}; do /bin/sleep 1; done"
+
   exec { 'netplan_apply':
-    command     => '/usr/sbin/netplan apply',
+    command     => "/usr/sbin/netplan apply && ${test_command}",
     logoutput   => 'on_failure',
     refreshonly => true,
+    provider    => 'shell',
   }
 
   concat { $netplan::config_file: