diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml
index 2d88f921c..2ec343e60 100644
--- a/.github/workflows/build_pipelinesrelease_template.yml
+++ b/.github/workflows/build_pipelinesrelease_template.yml
@@ -123,8 +123,7 @@ jobs:
     name: Run smoke tests on
     needs:
     - Validate-xbuild
-    runs-on:
-      - self-hosted
+    runs-on: ubuntu-latest
     if: success() && ${{inputs.skipTests == false}}
     steps:
     - name: checkout
diff --git a/.github/workflows/porter-release.yml b/.github/workflows/porter-release.yml
index 3e85f99f5..a51ed4605 100644
--- a/.github/workflows/porter-release.yml
+++ b/.github/workflows/porter-release.yml
@@ -7,9 +7,9 @@ on:
     - "!canary*"
 jobs:
   build_pipelinesrelease_template:
-    name: build_azure_pipelinesrelease_template
+    name: build_pipelinesrelease_template
     uses: "./.github/workflows/build_pipelinesrelease_template.yml"
     with:
       registry: ghcr.io/getporter
       shouldPublish: true
-      skipTests: true
+      skipTests: true
\ No newline at end of file