diff --git a/bundles/gce-workaround/items.py b/bundles/gce-workaround/items.py
index 529b696..feb0f82 100644
--- a/bundles/gce-workaround/items.py
+++ b/bundles/gce-workaround/items.py
@@ -1,12 +1,18 @@
 svc_systemd = {}
 
-for i in (
+for i in {
     'google-accounts-daemon.service',
     'google-accounts-manager.service',
     'google-clock-skew-daemon.service',
     'google-clock-sync-manager.service',
-    'sshguard.service'
-):
+    'google-guest-agent.service',
+    'google-osconfig-agent.service',
+    'google-shutdown-scripts.service',
+    'google-startup-scripts.service',
+    'sshguard.service',
+
+    'google-oslogin-cache.timer',
+}:
     svc_systemd[i] = {
         'enabled': False,
         'running': False,
diff --git a/nodes/gce/bind01.py b/nodes/gce/bind01.py
index c3dbd02..549cafc 100644
--- a/nodes/gce/bind01.py
+++ b/nodes/gce/bind01.py
@@ -6,16 +6,6 @@ nodes['gce.bind01'] = {
         'dns',
     },
     'metadata': {
-        'hosts': {
-            'entries': {
-                # FIXME Google keeps adding those entries. Find out why
-                # and remove it.
-                '10.156.0.4': {
-                    'bind01.europe-west3-c.c.omega-art-269710.internal',
-                    'bind01',
-                },
-            },
-        },
         'os': 'debian',
         'os_release': 'buster',
     },