diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index d07ef355..acdd0e3c 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -29,7 +29,7 @@ jobs:
     name: Terraform Provider Acceptance Tests
     needs:
       - build
-    runs-on: [self-hosted, jammy, x64]
+    runs-on: [self-hosted, xlarge, jammy, x64]
     timeout-minutes: 60
     strategy:
       fail-fast: false
diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml
index 7ec40b17..783c892a 100644
--- a/.github/workflows/test_integration.yml
+++ b/.github/workflows/test_integration.yml
@@ -109,7 +109,7 @@ jobs:
   add-machine-test:
     name: Add Machine
     needs: build
-    runs-on: [self-hosted, jammy, x64]
+    runs-on: [self-hosted, xlarge, jammy, x64]
     env:
       ACTIONS_ALLOW_IPV6: false
     strategy:
diff --git a/.github/workflows/test_integration_jaas.yaml b/.github/workflows/test_integration_jaas.yaml
index 876ce036..93f58cc6 100644
--- a/.github/workflows/test_integration_jaas.yaml
+++ b/.github/workflows/test_integration_jaas.yaml
@@ -28,7 +28,7 @@ jobs:
   # Ensure project builds before running test
   build:
     name: Build-JAAS
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, xlarge, jammy, x64]
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
   test:
     name: Integration-JAAS
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, xlarge, jammy, x64]
     strategy:
       fail-fast: false
     timeout-minutes: 60
@@ -68,11 +68,13 @@ jobs:
           sudo snap install microk8s --channel=1.28-strict/stable
           sudo usermod -a -G snap_microk8s $USER
           sudo chown -R $USER ~/.kube
-          sudo microk8s.enable dns storage
-          sudo microk8s.enable dns local-storage
+          sudo microk8s.enable dns
+          sudo microk8s.enable storage
+          sudo microk8s.enable hostpath-storage
           sudo -g snap_microk8s -E microk8s status --wait-ready --timeout=600
+          sudo microk8s.config view | tee /home/$USER/microk8s-config.yaml
           echo "MICROK8S_CONFIG<<EOF" >> $GITHUB_ENV
-          sudo microk8s.config view >> $GITHUB_ENV
+          echo "$(cat microk8s-config.yaml)" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
       - name: Create additional networks when testing with LXD
         run: |