diff --git a/dib/ironic-python-agent-ramdisk/post-install.d/80-ironic-python-agent-ramdisk b/dib/ironic-python-agent-ramdisk/post-install.d/80-ironic-python-agent-ramdisk
index 20e564d..7100d50 100755
--- a/dib/ironic-python-agent-ramdisk/post-install.d/80-ironic-python-agent-ramdisk
+++ b/dib/ironic-python-agent-ramdisk/post-install.d/80-ironic-python-agent-ramdisk
@@ -62,6 +62,16 @@ DHCP=yes" > /etc/systemd/network/99-dhcp.network
                 systemctl enable systemd-networkd
             fi
         fi
+        if [ -e /usr/lib/systemd/system/glean-early.service ]; then
+            # Disable Glean-early start
+            # Under normal cirumstances, glean-early attempts to mount a config
+            # drive, configure ssh and a hostname. We only need the mount, and we
+            # trigger that in ironic-agent-resolve-config-drive.service.
+            # This is largely because glean uses /mnt/config by default,
+            # where as cloud-init uses a random folder name.
+            systemctl disable glean-early.service || true
+            rm /usr/lib/systemd/system/glean-early.service
+        fi
         ;;
     sysv)
         update-rc.d iptables disable