diff --git a/features/attached_commands.feature b/features/attached_commands.feature
index 932ffce291..6f5c45f557 100644
--- a/features/attached_commands.feature
+++ b/features/attached_commands.feature
@@ -263,7 +263,7 @@ Feature: Command behaviour when attached to an Ubuntu Pro subscription
        Examples: ubuntu release
            | release | anbox | esm-apps | cc-eal | cis | fips | fips-update | ros | cis_or_usg | realtime-kernel |
            | xenial  | no    | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
-           | bionic  | yes   | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
+           | bionic  | no    | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
            | focal   | yes   | yes      | no     | yes | yes  | yes         | no  | usg        | no              |
            | jammy   | yes   | yes      | no     | yes | no   | no          | no  | usg        | yes             |
 
diff --git a/features/steps/machines.py b/features/steps/machines.py
index 756fd94a4b..5e0155095e 100644
--- a/features/steps/machines.py
+++ b/features/steps/machines.py
@@ -6,6 +6,7 @@
 from behave import given, when
 from pycloudlib.instance import BaseInstance  # type: ignore
 
+from features.steps.shell import when_i_run_command
 from features.steps.ubuntu_advantage_tools import when_i_install_uat
 from features.util import (
     SUT,
@@ -88,6 +89,16 @@ def given_a_machine(
         series=series, instance=instance
     )
 
+    if series == "xenial":
+        # Upgrading open-iscsi to esm version on xenial restarts this service
+        # This sometimes causes resource errors on github action runners
+        when_i_run_command(
+            context,
+            "systemctl mask iscsid.service",
+            "with sudo",
+            machine_name=machine_name,
+        )
+
     if cleanup:
 
         def cleanup_instance():