diff --git a/src/machine_workload.py b/src/machine_workload.py
index 62fee82e..4d94050f 100644
--- a/src/machine_workload.py
+++ b/src/machine_workload.py
@@ -24,7 +24,7 @@ class AuthenticatedMachineWorkload(workload.AuthenticatedWorkload):
     def _get_bootstrap_command(
         self, *, event, connection_info: "relations.database_requires.ConnectionInformation"
     ) -> typing.List[str]:
-        command = super()._get_bootstrap_command(connection_info)
+        command = super()._get_bootstrap_command(event=event, connection_info=connection_info)
         if self._charm.is_externally_accessible(event=event):
             command.extend(
                 [
diff --git a/src/upgrade.py b/src/upgrade.py
index d1546b95..0535c89f 100644
--- a/src/upgrade.py
+++ b/src/upgrade.py
@@ -223,7 +223,7 @@ def authorized(self) -> bool:
         """
 
     @abc.abstractmethod
-    def upgrade_unit(self, *, workload_: workload.Workload, tls: bool) -> None:
+    def upgrade_unit(self, *, event, workload_: workload.Workload, tls: bool) -> None:
         """Upgrade this unit.
 
         Only applies to machine charm
diff --git a/src/workload.py b/src/workload.py
index 01818b3e..de4b3c2f 100644
--- a/src/workload.py
+++ b/src/workload.py
@@ -232,7 +232,7 @@ def _cleanup_after_upgrade_or_potential_container_restart(self) -> None:
 
     # TODO python3.10 min version: Use `list` instead of `typing.List`
     def _get_bootstrap_command(
-        self, connection_info: "relations.database_requires.ConnectionInformation"
+        self, *, event, connection_info: "relations.database_requires.ConnectionInformation"
     ) -> typing.List[str]:
         return [
             "--bootstrap",
@@ -430,7 +430,7 @@ def upgrade(
         if enabled:
             logger.debug("Disabling MySQL Router service before upgrade")
             self._disable_router()
-        super().upgrade(unit=unit, tls=tls, exporter_config=exporter_config)
+        super().upgrade(event=event, unit=unit, tls=tls, exporter_config=exporter_config)
         if enabled:
             logger.debug("Re-enabling MySQL Router service after upgrade")
             self._enable_router(event=event, tls=tls, unit_name=unit.name)