diff --git a/.github/workflows/comment-deploy-link.yaml b/.github/workflows/comment-deploy-link.yaml
index 424ea19..335ca46 100644
--- a/.github/workflows/comment-deploy-link.yaml
+++ b/.github/workflows/comment-deploy-link.yaml
@@ -19,7 +19,7 @@ on:
       runs-on:
         type: string
         required: false
-        default: fear-ephemeral
+        default: ci-universal
 
 jobs:
   comment:
diff --git a/workflow-templates/library-checks-and-release.yml b/workflow-templates/library-checks-and-release.yml
index 5c032ea..3e78035 100644
--- a/workflow-templates/library-checks-and-release.yml
+++ b/workflow-templates/library-checks-and-release.yml
@@ -17,7 +17,7 @@ env:
 jobs:
   main:
     name: Run checks and deploy
-    runs-on: [self-hosted, fear]
+    runs-on: [self-hosted, ci-universal]
 
     steps:
       - name: Check out Git repository