diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a0a91e6a..d37622f17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   main:
-    runs-on: [self-hosted,Office]
+    runs-on: [self-hosted,FlipperZero]
     steps:
       - name: 'Cleanup workspace'
         uses: AutoModality/action-clean@v1
@@ -166,7 +166,7 @@ jobs:
 
   compact:
     if: ${{ !startsWith(github.ref, 'refs/tags') }}
-    runs-on: [self-hosted,koteeq]
+    runs-on: [self-hosted,FlipperZero]
     steps:
       - name: 'Cleanup workspace'
         uses: AutoModality/action-clean@v1
diff --git a/.github/workflows/lint_c.yml b/.github/workflows/lint_c.yml
index 52a5e9d7e..97ef9fb90 100644
--- a/.github/workflows/lint_c.yml
+++ b/.github/workflows/lint_c.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   lint_c_cpp:
-    runs-on: [self-hosted,Office]
+    runs-on: [self-hosted,FlipperZero]
     steps:
       - name: 'Cleanup workspace'
         uses: AutoModality/action-clean@v1
diff --git a/.github/workflows/reindex.yml b/.github/workflows/reindex.yml
index 49c47eece..78f9cbead 100644
--- a/.github/workflows/reindex.yml
+++ b/.github/workflows/reindex.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   reindex:
     name: 'Reindex updates'
-    runs-on: [self-hosted,Office]
+    runs-on: [self-hosted,FlipperZero]
     steps:
       - name: Trigger reindex
         uses: wei/curl@master