diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d38454932..20f5d7cc1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,11 +10,11 @@ env:
 
 jobs:
   main:
-    runs-on: [self-hosted, FlipperZeroShell]
+    runs-on: [self-hosted]
     strategy:
       fail-fast: false
       matrix:
-        target: [f7, f18]
+        target: [f7]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
@@ -70,18 +70,18 @@ jobs:
           rm -rf artifacts map_analyser_files || true
           mkdir artifacts map_analyser_files
           cp dist/${TARGET}-*/* artifacts/ || true
-          tar czpf "artifacts/flipper-z-${TARGET}-resources-${SUFFIX}.tgz" \
+          tar czpf "artifacts/kiisu-z-${TARGET}-resources-${SUFFIX}.tgz" \
             -C build/latest resources
-          tar czpf "artifacts/flipper-z-${TARGET}-debugapps-${SUFFIX}.tgz" \
+          tar czpf "artifacts/kiisu-z-${TARGET}-debugapps-${SUFFIX}.tgz" \
             -C dist/${TARGET}-*/apps/Debug .
-          tar czpf "artifacts/flipper-z-${TARGET}-appsymbols-${SUFFIX}.tgz" \
+          tar czpf "artifacts/kiisu-z-${TARGET}-appsymbols-${SUFFIX}.tgz" \
             -C dist/${TARGET}-*/debug_elf .
 
       - name: 'Copy universal artifacts'
         if: ${{ !github.event.pull_request.head.repo.fork && matrix.target == env.DEFAULT_TARGET }}
         run: |
-          tar czpf "artifacts/flipper-z-any-scripts-${SUFFIX}.tgz" scripts
-          cp build/core2_firmware.tgz "artifacts/flipper-z-any-core2_firmware-${SUFFIX}.tgz"
+          tar czpf "artifacts/kiisu-z-any-scripts-${SUFFIX}.tgz" scripts
+          cp build/core2_firmware.tgz "artifacts/kiisu-z-any-core2_firmware-${SUFFIX}.tgz"
 
       - name: 'Upload artifacts to update server'
         if: ${{ !github.event.pull_request.head.repo.fork }}
@@ -122,10 +122,10 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             **Compiled ${{ matrix.target }} firmware for commit `${{steps.names.outputs.commit_sha}}`:**
-            - [📦 Update package](https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
-            - [📥 DFU file](https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-full-${{steps.names.outputs.suffix}}.dfu)
-            - [☁️ Web/App updater](https://lab.flipper.net/?url=https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
-            - [📊 Size report](https://fw-reports.flipp.dev/?branch=${{steps.names.outputs.branch_name}})
+            - [📦 Update package](https://update.kiisu.io/builds/firmware/${{steps.names.outputs.branch_name}}/kiisu-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
+            - [📥 DFU file](https://update.kiisu.io/builds/firmware/${{steps.names.outputs.branch_name}}/kiisu-z-${{steps.names.outputs.default_target}}-full-${{steps.names.outputs.suffix}}.dfu)
+            - [☁️ Web/App updater](https://lab.flipper.net/?url=https://update.kiisu.io/builds/firmware/${{steps.names.outputs.branch_name}}/kiisu-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
+            - [📊 Size report](https://fw-reports.kiisu.io/?branch=${{steps.names.outputs.branch_name}})
           edit-mode: replace
 
       - name: 'SDK submission to staging catalog'
diff --git a/.github/workflows/build_compact.yml b/.github/workflows/build_compact.yml
index c1cdbaa99..f652f5379 100644
--- a/.github/workflows/build_compact.yml
+++ b/.github/workflows/build_compact.yml
@@ -81,6 +81,6 @@ jobs:
 #    name: Report status
 #    needs: [compact]
 #    if: always() && !contains(needs.*.result, 'failure')
-#    runs-on: [self-hosted, FlipperZeroShell]
+#    runs-on: [self-hosted]
 #    steps:
 #      - run: echo "All good ✨" ;
diff --git a/.github/workflows/lint_and_submodule_check.yml b/.github/workflows/lint_and_submodule_check.yml
index 65e41a284..f5d38ba3c 100644
--- a/.github/workflows/lint_and_submodule_check.yml
+++ b/.github/workflows/lint_and_submodule_check.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   lint_sources_check_submodules:
-    runs-on: [self-hosted, FlipperZeroShell]
+    runs-on: [self-hosted]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
diff --git a/.github/workflows/merge_report.yml b/.github/workflows/merge_report.yml
index 105252cb0..0ce089932 100644
--- a/.github/workflows/merge_report.yml
+++ b/.github/workflows/merge_report.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   merge_report:
-    runs-on: [self-hosted, FlipperZeroShell]
+    runs-on: [self-hosted]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
diff --git a/.github/workflows/pvs_studio.yml b/.github/workflows/pvs_studio.yml
index 6eb37bca1..8189d0e10 100644
--- a/.github/workflows/pvs_studio.yml
+++ b/.github/workflows/pvs_studio.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   analyse_c_cpp:
     if: ${{ !github.event.pull_request.head.repo.fork }}
-    runs-on: [self-hosted, FlipperZeroShell]
+    runs-on: [self-hosted]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
diff --git a/.github/workflows/reindex.yml b/.github/workflows/reindex.yml
index 4489c7093..7242e4f19 100644
--- a/.github/workflows/reindex.yml
+++ b/.github/workflows/reindex.yml
@@ -1,13 +1,11 @@
 name: 'Post-release hooks'
 
-on:
-  release:
-    types: [prereleased, released]
+on: workflow_dispatch
 
 jobs:
   reindex:
     name: 'Post-release hooks'
-    runs-on: [self-hosted, FlipperZeroShell]
+    runs-on: [self-hosted]
     steps:
       - name: 'Checkout code'
         uses: actions/checkout@v4
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 21cd81cc8..af3e0e76c 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   run_units_on_bench:
-    runs-on: [ self-hosted, FlipperZeroTest ]
+    runs-on: [ self-hosted]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/updater_test.yml b/.github/workflows/updater_test.yml
index 55978ac98..f49663609 100644
--- a/.github/workflows/updater_test.yml
+++ b/.github/workflows/updater_test.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   test_updater_on_bench:
-    runs-on: [self-hosted, FlipperZeroTest ]
+    runs-on: [self-hosted]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4