diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8056e4f2da5..2adfbce3577 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1356,7 +1356,7 @@ jobs:
 ##############################################################################################
   ASTFuzzerTestAsan:
     needs: [BuilderDebAsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1384,7 +1384,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestTsan:
     needs: [BuilderDebTsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1412,7 +1412,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestUBSan:
     needs: [BuilderDebUBsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1440,7 +1440,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestMSan:
     needs: [BuilderDebMsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1468,7 +1468,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestDebug:
     needs: [BuilderDebDebug]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1614,7 +1614,7 @@ jobs:
 #############################################################################################
   UnitTestsAsan:
     needs: [BuilderDebAsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1642,7 +1642,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsReleaseClang:
     needs: [BuilderBinRelease]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1670,7 +1670,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsTsan:
     needs: [BuilderDebTsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1698,7 +1698,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsMsan:
     needs: [BuilderDebMsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1726,7 +1726,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsUBsan:
     needs: [BuilderDebUBsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 9f068305c77..26921b8ea48 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -1356,7 +1356,7 @@ jobs:
 ##############################################################################################
   ASTFuzzerTestAsan:
     needs: [BuilderDebAsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1384,7 +1384,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestTsan:
     needs: [BuilderDebTsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1412,7 +1412,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestUBSan:
     needs: [BuilderDebUBsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1440,7 +1440,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestMSan:
     needs: [BuilderDebMsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1468,7 +1468,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   ASTFuzzerTestDebug:
     needs: [BuilderDebDebug]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1499,7 +1499,7 @@ jobs:
 #############################################################################################
   UnitTestsAsan:
     needs: [BuilderDebAsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1527,7 +1527,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsReleaseClang:
     needs: [BuilderBinRelease]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1555,7 +1555,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsTsan:
     needs: [BuilderDebTsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1583,7 +1583,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsMsan:
     needs: [BuilderDebMsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1611,7 +1611,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
   UnitTestsUBsan:
     needs: [BuilderDebUBsan]
-    runs-on: [self-hosted, func-tester]
+    runs-on: [self-hosted, fuzzer-unit-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
diff --git a/tests/ci/metrics_lambda/app.py b/tests/ci/metrics_lambda/app.py
index fbe695c4500..dff0a7d715e 100644
--- a/tests/ci/metrics_lambda/app.py
+++ b/tests/ci/metrics_lambda/app.py
@@ -104,7 +104,7 @@ def list_runners(access_token):
 def group_runners_by_tag(listed_runners):
     result = {}
 
-    RUNNER_TYPE_LABELS = ['style-checker', 'builder', 'func-tester', 'stress-tester']
+    RUNNER_TYPE_LABELS = ['style-checker', 'builder', 'func-tester', 'stress-tester', 'fuzzer-unit-tester']
     for runner in listed_runners:
         for tag in runner.tags:
             if tag in RUNNER_TYPE_LABELS:
diff --git a/tests/ci/worker/init_fuzzer_unit_tester.sh b/tests/ci/worker/init_fuzzer_unit_tester.sh
new file mode 100644
index 00000000000..2fbedba9e40
--- /dev/null
+++ b/tests/ci/worker/init_fuzzer_unit_tester.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+echo "Running init script"
+export DEBIAN_FRONTEND=noninteractive
+export RUNNER_HOME=/home/ubuntu/actions-runner
+
+export RUNNER_URL="https://github.com/ClickHouse"
+# Funny fact, but metadata service has fixed IP
+export INSTANCE_ID=`curl -s http://169.254.169.254/latest/meta-data/instance-id`
+
+while true; do
+    runner_pid=`pgrep run.sh`
+    echo "Got runner pid $runner_pid"
+
+    cd $RUNNER_HOME
+    if [ -z "$runner_pid" ]; then
+        echo "Receiving token"
+        RUNNER_TOKEN=`/usr/local/bin/aws ssm  get-parameter --name github_runner_registration_token --with-decryption --output text --query Parameter.Value`
+
+        echo "Will try to remove runner"
+        sudo -u ubuntu ./config.sh remove --token $RUNNER_TOKEN ||:
+
+        echo "Going to configure runner"
+        sudo -u ubuntu ./config.sh --url $RUNNER_URL --token $RUNNER_TOKEN --name $INSTANCE_ID --runnergroup Default --labels 'self-hosted,Linux,X64,fuzzer-unit-tester' --work _work
+
+        echo "Run"
+        sudo -u ubuntu ./run.sh &
+        sleep 15
+    else
+        echo "Runner is working with pid $runner_pid, nothing to do"
+        sleep 10
+    fi
+done