diff --git a/jobs/integration/conftest.py b/jobs/integration/conftest.py
index 79bc5cc6a..011f8a5a7 100644
--- a/jobs/integration/conftest.py
+++ b/jobs/integration/conftest.py
@@ -174,13 +174,14 @@ async def model(request, event_loop, tools):
         await upgrade_snaps(model, upgrade_snap_channel, tools)
     if request.config.getoption("--snapd-upgrade"):
         snapd_channel = request.config.getoption("--snapd-channel")
-        cmd = f"sudo snap refresh core --{snapd_channel}"
-        cloudinit_userdata = {"postruncmd": [cmd]}
-        cloudinit_userdata_str = yaml.dump(cloudinit_userdata)
-        await model.set_config({"cloudinit-userdata": cloudinit_userdata_str})
         await model.deploy("cs:~containers/charmed-kubernetes")
         await log_snap_versions(model, prefix="Before")
         await tools.juju_wait()
+        for unit in model.units.values():
+            if unit.dead:
+                continue
+            await unit.run(f"sudo snap refresh core --{snapd_channel}")
+        await tools.juju_wait()
         await log_snap_versions(model, prefix="After")
     yield model
     await model.disconnect()