diff --git a/.github/actions/start-aws-runner/action.yml b/.github/actions/start-aws-runner/action.yml
index ae3ba61873e50..635bb7f5cbc01 100644
--- a/.github/actions/start-aws-runner/action.yml
+++ b/.github/actions/start-aws-runner/action.yml
@@ -8,7 +8,8 @@ inputs:
   github-token:
     required: true
   ec2-image-id:
-    default: "ami-04bd6e81239f4f3fb"
+    # github-self-hosted-runner-ubuntu-20-100g-disk
+    default: "ami-0ccd67e0abd945eec"
     required: true
   ec2-instance-type:
     default: "c5.2xlarge"
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index adc1ad47b14d9..c5c53c331a1b9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -482,6 +482,7 @@ jobs:
         id: start-ec2-runner
         uses: ./.github/actions/start-aws-runner
         with:
+          # github-self-hosted-runner-ubuntu-20-with-120gdisk-docker-20.10.7
           ec2-image-id: ami-0d4083c04fde515c4
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/publish-command.yml b/.github/workflows/publish-command.yml
index f73a4dacd4161..2770eaa8b35f7 100644
--- a/.github/workflows/publish-command.yml
+++ b/.github/workflows/publish-command.yml
@@ -34,6 +34,7 @@ jobs:
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
+          # 80 gb disk
           ec2-image-id: ami-0d648081937c75a73
   publish-image:
     needs: start-publish-image-runner
diff --git a/.github/workflows/test-command.yml b/.github/workflows/test-command.yml
index 8c747eaf76451..363e72851248d 100644
--- a/.github/workflows/test-command.yml
+++ b/.github/workflows/test-command.yml
@@ -33,6 +33,7 @@ jobs:
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
+          # 80 gb disk
           ec2-image-id: ami-0d648081937c75a73
   integration-test:
     timeout-minutes: 240
diff --git a/.github/workflows/test-performance-command.yml b/.github/workflows/test-performance-command.yml
index 1cf83a0b24a64..a3e0dfbce070c 100644
--- a/.github/workflows/test-performance-command.yml
+++ b/.github/workflows/test-performance-command.yml
@@ -39,6 +39,7 @@ jobs:
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
+          # 80 gb disk
           ec2-image-id: ami-0d648081937c75a73
   performance-test:
     timeout-minutes: 240