diff --git a/jobs/ci-run/integration/gen/test-cloud_azure.yml b/jobs/ci-run/integration/gen/test-cloud_azure.yml
new file mode 100644
index 0000000..d1d917c
--- /dev/null
+++ b/jobs/ci-run/integration/gen/test-cloud_azure.yml
@@ -0,0 +1,396 @@
+
+
+# Code generated by gen-wire-tests. DO NOT EDIT.
+- job:
+    name: 'test-cloud_azure-multijob'
+    project-type: 'multijob'
+    description: |-
+        Test cloud_azure Suite
+    condition: SUCCESSFUL
+    node: noop-parent-jobs
+    concurrent: true
+    wrappers:
+    - ansicolor
+    - workspace-cleanup
+    - timestamps
+    parameters:
+    - string:
+        default: ''
+        description: 'Enable sub job to be run individually.'
+        name: SHORT_GIT_COMMIT
+    - string:
+        default: ''
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    builders:
+    - get-build-details
+    - set-test-description
+    - multijob:
+        name: 'IntegrationTests-cloud_azure'
+        projects:
+        - name: 'test-cloud_azure-test-managed-identity-aws'
+          current-parameters: true
+        - name: 'test-cloud_azure-test-managed-identity-azure'
+          current-parameters: true
+        - name: 'test-cloud_azure-test-managed-identity-google'
+          current-parameters: true
+        - name: 'test-cloud_azure-test-managed-identity-lxd'
+          current-parameters: true
+        - name: 'test-cloud_azure-test-managed-identity-microk8s'
+          current-parameters: true
+
+- job:
+    name: test-cloud_azure-test-managed-identity-aws
+    node: ephemeral-focal-small-amd64
+    description: |-
+      Test cloud_azure suite on aws
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'aws'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'ec2'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: 'us-east-1'
+        description: 'Cloud Region to use when bootstrapping Juju'
+        name: BOOTSTRAP_REGION
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - select-oci-registry
+      - wait-for-cloud-init
+      - prepare-integration-test
+      - run-integration-test:
+            test_name: 'cloud_azure'
+            setup_steps: ''
+            task_name: ''
+            skip_tasks: ''
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-cloud_azure-test-managed-identity-azure
+    node: ephemeral-focal-small-amd64
+    description: |-
+      Test cloud_azure suite on azure
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'azure'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'azure'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: 'eastus'
+        description: 'Cloud Region to use when bootstrapping Juju'
+        name: BOOTSTRAP_REGION
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - select-oci-registry
+      - wait-for-cloud-init
+      - prepare-integration-test
+      - run-integration-test:
+            test_name: 'cloud_azure'
+            setup_steps: ''
+            task_name: ''
+            skip_tasks: ''
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-cloud_azure-test-managed-identity-google
+    node: ephemeral-focal-small-amd64
+    description: |-
+      Test cloud_azure suite on google
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'google'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'gce'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: 'us-east1'
+        description: 'Cloud Region to use when bootstrapping Juju'
+        name: BOOTSTRAP_REGION
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - select-oci-registry
+      - wait-for-cloud-init
+      - prepare-integration-test
+      - run-integration-test:
+            test_name: 'cloud_azure'
+            setup_steps: ''
+            task_name: ''
+            skip_tasks: ''
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-cloud_azure-test-managed-identity-lxd
+    node: ephemeral-focal-8c-32g-amd64
+    description: |-
+      Test cloud_azure suite on lxd
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'localhost'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'lxd'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - select-oci-registry
+      - wait-for-cloud-init
+      - prepare-integration-test
+      - run-integration-test:
+            test_name: 'cloud_azure'
+            setup_steps: ''
+            task_name: ''
+            skip_tasks: ''
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-cloud_azure-test-managed-identity-microk8s
+    node: ephemeral-focal-8c-32g-amd64
+    description: |-
+      Test cloud_azure suite on microk8s
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'microk8s'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'k8s'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - select-oci-registry
+      - wait-for-cloud-init
+      - prepare-integration-test
+      - run-integration-test-microk8s:
+            test_name: 'cloud_azure'
+            setup_steps: ''
+            task_name: ''
+            skip_tasks: ''
+    publishers:
+      - integration-artifacts
diff --git a/jobs/ci-run/integration/gen/test-deploy-unstable.yml b/jobs/ci-run/integration/gen/test-deploy-unstable.yml
index 114e513..6f59cd6 100644
--- a/jobs/ci-run/integration/gen/test-deploy-unstable.yml
+++ b/jobs/ci-run/integration/gen/test-deploy-unstable.yml
@@ -32,7 +32,3 @@
     - multijob:
         name: 'IntegrationTests-deploy'
         projects:
-        - name: 'test-deploy-test-deploy-bundles-lxd'
-          current-parameters: true
-        - name: 'test-deploy-test-deploy-os-aws'
-          current-parameters: true
diff --git a/jobs/ci-run/integration/gen/test-deploy.yml b/jobs/ci-run/integration/gen/test-deploy.yml
index aa6564e..64f7f6f 100644
--- a/jobs/ci-run/integration/gen/test-deploy.yml
+++ b/jobs/ci-run/integration/gen/test-deploy.yml
@@ -38,6 +38,8 @@
           current-parameters: true
         - name: 'test-deploy-test-deploy-bundles-aws'
           current-parameters: true
+        - name: 'test-deploy-test-deploy-bundles-lxd'
+          current-parameters: true
         - name: 'test-deploy-test-deploy-charms-aws'
           current-parameters: true
         - name: 'test-deploy-test-deploy-charms-lxd'
@@ -46,8 +48,6 @@
           current-parameters: true
         - name: 'test-deploy-test-deploy-default-series-lxd'
           current-parameters: true
-        - name: 'test-deploy-test-deploy-os-lxd'
-          current-parameters: true
         - name: 'test-deploy-test-deploy-revision-aws'
           current-parameters: true
         - name: 'test-deploy-test-deploy-revision-lxd'
@@ -121,7 +121,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_cmr_bundles_export_overlay'
-            skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -189,7 +189,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_cmr_bundles_export_overlay'
-            skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -261,7 +261,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_bundles'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -329,7 +329,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_bundles'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -401,7 +401,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_charms'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -469,7 +469,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_charms'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -541,7 +541,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_default_series'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_os,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -609,147 +609,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_default_series'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_os,test_deploy_revision'
-    publishers:
-      - integration-artifacts
-
-- job:
-    name: test-deploy-test-deploy-os-aws
-    node: ephemeral-focal-small-amd64
-    description: |-
-      Test test_deploy_os in deploy suite on aws
-    parameters:
-    - validating-string:
-        name: SHORT_GIT_COMMIT
-        description: 'Enable sub job to be run individually.'
-        regex: ^\S{7}$
-        msg: Enter a valid 7 char git sha
-    - choice:
-        default: 'amd64'
-        description: 'Build arch used to download the build tar.gz.'
-        name: BUILD_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - choice:
-        default: ''
-        description: 'Arch used to boostrap controller.'
-        name: BOOTSTRAP_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - choice:
-        default: ''
-        description: 'Arch used for hosted models.'
-        name: MODEL_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - string:
-        default: 'aws'
-        description: 'Cloud to use when bootstrapping Juju'
-        name: BOOTSTRAP_CLOUD
-    - string:
-        default: 'ec2'
-        description: 'Provider to use when bootstrapping Juju'
-        name: BOOTSTRAP_PROVIDER
-    - string:
-        default: 'us-east-1'
-        description: 'Cloud Region to use when bootstrapping Juju'
-        name: BOOTSTRAP_REGION
-    - string:
-        default: ''
-        description: 'Ubuntu series to use when bootstrapping Juju'
-        name: BOOTSTRAP_SERIES
-    wrappers:
-      - default-integration-test-wrapper
-      - timeout:
-          timeout: 30
-          fail: true
-          type: absolute
-    builders:
-      - select-oci-registry
-      - wait-for-cloud-init
-      - prepare-integration-test
-      - run-integration-test:
-            test_name: 'deploy'
-            setup_steps: ''
-            task_name: 'test_deploy_os'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
-    publishers:
-      - integration-artifacts
-
-- job:
-    name: test-deploy-test-deploy-os-lxd
-    node: ephemeral-focal-8c-32g-amd64
-    description: |-
-      Test test_deploy_os in deploy suite on lxd
-    parameters:
-    - validating-string:
-        name: SHORT_GIT_COMMIT
-        description: 'Enable sub job to be run individually.'
-        regex: ^\S{7}$
-        msg: Enter a valid 7 char git sha
-    - choice:
-        default: 'amd64'
-        description: 'Build arch used to download the build tar.gz.'
-        name: BUILD_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - choice:
-        default: ''
-        description: 'Arch used to boostrap controller.'
-        name: BOOTSTRAP_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - choice:
-        default: ''
-        description: 'Arch used for hosted models.'
-        name: MODEL_ARCH
-        choices:
-        - amd64
-        - arm64
-        - s390x
-        - ppc64el
-    - string:
-        default: 'localhost'
-        description: 'Cloud to use when bootstrapping Juju'
-        name: BOOTSTRAP_CLOUD
-    - string:
-        default: 'lxd'
-        description: 'Provider to use when bootstrapping Juju'
-        name: BOOTSTRAP_PROVIDER
-    - string:
-        default: ''
-        description: 'Ubuntu series to use when bootstrapping Juju'
-        name: BOOTSTRAP_SERIES
-    wrappers:
-      - default-integration-test-wrapper
-      - timeout:
-          timeout: 30
-          fail: true
-          type: absolute
-    builders:
-      - select-oci-registry
-      - wait-for-cloud-init
-      - prepare-integration-test
-      - run-integration-test:
-            test_name: 'deploy'
-            setup_steps: ''
-            task_name: 'test_deploy_os'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_revision'
     publishers:
       - integration-artifacts
 
@@ -821,7 +681,7 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_revision'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series'
     publishers:
       - integration-artifacts
 
@@ -889,6 +749,6 @@
             test_name: 'deploy'
             setup_steps: ''
             task_name: 'test_deploy_revision'
-            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os'
+            skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series'
     publishers:
       - integration-artifacts
diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config
index cadb2c7..0d7c34a 100644
--- a/tools/gen-wire-tests/juju.config
+++ b/tools/gen-wire-tests/juju.config
@@ -45,8 +45,6 @@ folders:
       test_deploy_charms: 50
   unstable:
     deploy:
-      lxd:
-        - test_deploy_bundles
       aws:
         - test_deploy_os
     model: