diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 9ecdb72d..8b883e56 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -26,9 +26,13 @@ jobs:
           - "ruby"
     steps:
       - uses: actions/checkout@v2
-      - run: sed -i 's/python/'"$ISUCON_APP_LANG"'/g' ./docker-compose.yml  && make build
+      - run: echo 'Run benchmark for ISHOCON2'
+      - run: |
+         sed -i 's/python/'"$ISHOCON_APP_LANG"'/g' ./docker-compose.yml
+         cat ./docker-compose.yml
+         make build
         env:
-            ISHOCON_APP_LANG: run_${{ matrix.language }}
-      - run: make up && sleep 10
+            ISHOCON_APP_LANG: ${{ matrix.language }}
+      - run: make up && sleep 30
       - run: make bench
         timeout-minutes: 5
diff --git a/Makefile b/Makefile
index 73c2477f..1d19f64a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,5 +10,5 @@ up: build
 down: 
 	docker compose down
 
-bench: up
+bench:
 	docker exec -i ishocon2-bench-1 sh -c "./benchmark --ip app:443"
diff --git a/run.sh b/run.sh
index d8495eb6..5be64398 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,8 @@
 
 app_lang="${ISHOCON_APP_LANG}"
 
+make build
+
 if [ -z "$app_lang" ]
 then
   echo "ISHOCON_APP_LANG is not set"