diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml
index ca84e62bae..3cf5b688bb 100644
--- a/.github/workflows/e2e_test.yaml
+++ b/.github/workflows/e2e_test.yaml
@@ -21,7 +21,7 @@ jobs:
       modules: '["test_e2e"]'
       extra-arguments: "-m openstack"
       self-hosted-runner: true
-      self-hosted-runner-label: stg-private-endpoint
+      self-hosted-runner-label: pfe-ci
 
   required_status_checks:
     name: Required E2E Test Status Checks
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
index 649d47df23..23b995f8e4 100644
--- a/.github/workflows/integration_test.yaml
+++ b/.github/workflows/integration_test.yaml
@@ -23,7 +23,7 @@ jobs:
       modules: '["test_charm_metrics_failure", "test_charm_metrics_success", "test_charm_fork_repo", "test_charm_fork_path_change", "test_charm_no_runner", "test_charm_runner", "test_debug_ssh", "test_charm_upgrade",  "test_reactive", "test_jobmanager_prespawned", "test_jobmanager_reactive"]'
       extra-arguments: '-m openstack --log-format="%(asctime)s %(levelname)s %(message)s"'
       self-hosted-runner: true
-      self-hosted-runner-label: stg-private-endpoint
+      self-hosted-runner-label: pfe-ci 
   openstack-integration-tests-cross-controller-private-endpoint:
     name: Cross controller integration test using private-endpoint
     uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
@@ -36,7 +36,7 @@ jobs:
       modules: '["test_prometheus_metrics"]'
       extra-arguments: '-m openstack --log-format="%(asctime)s %(levelname)s %(message)s"'
       self-hosted-runner: true
-      self-hosted-runner-label: stg-private-endpoint
+      self-hosted-runner-label: pfe-ci
   allure-report:
     if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
     needs:
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index a9436a0259..b50ff03ab8 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -519,10 +519,13 @@ async def app_scheduled_events_fixture(
 async def app_no_wait_tmate_fixture(
     model: Model,
     app_openstack_runner,
+    tmate_ssh_server_app: Application,
 ):
     """Application to check tmate ssh with openstack without waiting for active."""
     application = app_openstack_runner
+    await application.relate("debug-ssh", f"{tmate_ssh_server_app.name}:debug-ssh")
     await application.set_config({BASE_VIRTUAL_MACHINES_CONFIG_NAME: "1"})
+    await model.wait_for_idle(apps=[tmate_ssh_server_app.name], status=ACTIVE, timeout=60 * 30)
     return application
 
 
@@ -582,14 +585,9 @@ async def app_no_wait_fixture(
 
 
 @pytest_asyncio.fixture(scope="module", name="tmate_ssh_server_app")
-async def tmate_ssh_server_app_fixture(
-    model: Model, app_no_wait_tmate: Application
-) -> AsyncIterator[Application]:
+async def tmate_ssh_server_app_fixture(model: Model) -> AsyncIterator[Application]:
     """tmate-ssh-server charm application related to GitHub-Runner app charm."""
     tmate_app: Application = await model.deploy("tmate-ssh-server", channel="edge")
-    await app_no_wait_tmate.relate("debug-ssh", f"{tmate_app.name}:debug-ssh")
-    await model.wait_for_idle(apps=[tmate_app.name], status=ACTIVE, timeout=60 * 30)
-
     return tmate_app