diff --git a/bundles/gce-workaround/items.py b/bundles/gce-workaround/items.py
index d28cd7e..583e055 100644
--- a/bundles/gce-workaround/items.py
+++ b/bundles/gce-workaround/items.py
@@ -2,7 +2,6 @@ svc_systemd = {}
 pkg_apt = {}
 
 for i in {
-    'chrony',
     'gce-disk-expand',
     'google-cloud-packages-archive-keyring',
     'google-cloud-sdk',
diff --git a/bundles/systemd/metadata.py b/bundles/systemd/metadata.py
index 9c8fa43..1a418d9 100644
--- a/bundles/systemd/metadata.py
+++ b/bundles/systemd/metadata.py
@@ -1,12 +1,32 @@
-if node.has_bundle('apt') and node.os_version[0] > 10:
-    defaults = {
-        'apt': {
-            'packages': {
-                'systemd-timesyncd': {
-                    'needed_by': {
-                        'action:systemd-enable-ntp',
-                    },
+defaults = {
+    'apt': {
+        'packages': {
+            'chrony': {
+                'installed': False,
+            },
+            'ntp': {
+                'installed': False,
+            },
+        },
+    },
+    'icinga2_api': {
+        'systemd': {
+            'services': {
+                'SYSTEMD-TIMESYNCD STATUS': {
+                    'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_systemd_unit systemd-timesyncd',
                 },
             },
         },
+    },
+}
+
+if node.has_bundle('apt') and node.os_version[0] > 10:
+    defaults['apt']['packages']['systemd-timesyncd'] = {
+        'after': {
+            'pkg_apt:chrony',
+            'pkg_apt:ntp',
+        },
+        'needed_by': {
+            'action:systemd-enable-ntp',
+        },
     }