diff --git a/.gitattributes b/.gitattributes
index f0bcaad..fc31fcf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,9 +3,7 @@
 /tests export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-Dockerfile.test export-ignore
-Dockerfile.tidb export-ignore
+Dockerfile export-ignore
 docker-compose.yml export-ignore
 Makefile export-ignore
 phpunit.xml export-ignore
-wait-for-it.sh export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e9d271d..2eaf550 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,9 @@
 version: 2
 updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "composer"
     directory: "/"
     schedule:
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
index 86f4788..2070393 100644
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -5,8 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
       - run: echo "🖥️ The workflow is now ready to test your code on the runner."
       - name: Run test with docker compose
-        run: docker-compose run test
+        run: docker compose run test
diff --git a/.gitignore b/.gitignore
index 6a07cca..f77f2ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .env
 .idea
-.phpunit.result.cache
+.phpunit.cache
 vendor
 composer.lock
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..10bd268
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM php:8-cli-alpine
+
+COPY --from=composer:latest "/usr/bin/composer" "/usr/local/bin/composer"
+
+ENV TZ="Asia/Tokyo"
+
+RUN docker-php-ext-install -j$(nproc) "pdo" "pdo_mysql"
+
+COPY ./ "/project"
+
+WORKDIR "/project"
diff --git a/Dockerfile.test b/Dockerfile.test
deleted file mode 100644
index 68e64c3..0000000
--- a/Dockerfile.test
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM php:8-cli-alpine
-
-ENV TZ Asia/Tokyo
-ENV PATH="${PATH}:/project/vendor/bin"
-
-RUN apk add --no-cache bash coreutils \
-  && docker-php-ext-install -j$(nproc) pdo pdo_mysql \
-  && docker-php-ext-enable opcache \
-  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
-  && mkdir -p /project/
-
-WORKDIR /project
diff --git a/Dockerfile.tidb b/Dockerfile.tidb
deleted file mode 100644
index 2452b97..0000000
--- a/Dockerfile.tidb
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ubuntu:latest
-
-ENV TZ Asia/Tokyo
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update \
-  && apt-get -y install curl tzdata \
-  && ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime \
-  && dpkg-reconfigure --frontend noninteractive tzdata \
-  && curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh \
-  && /root/.tiup/bin/tiup install playground tiflash prometheus
-
-EXPOSE 2379 3000 4000 9090 10080
diff --git a/Makefile b/Makefile
index 13010d5..3fdbbe0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ update:
 	$(BASE_COMMAND) run test composer update
 	$(BASE_COMMAND) down --remove-orphans
 
-bash:
+sh:
 	$(BASE_COMMAND) run test /bin/sh
 
 tidb:
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 0000000..62c1ac0
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,18 @@
+version: '3.4'
+
+services:
+  test:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    command: "/bin/sh -c 'composer install && composer exec -- phpunit'"
+    depends_on:
+      - tidb
+    entrypoint: []
+    volumes:
+      - .:/project:delegated
+  tidb:
+    image: pingcap/tidb:latest
+    ports:
+      - "4000:4000"
+      - "10080:10080"
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 826a649..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-services:
-  test:
-    build:
-      context: .
-      dockerfile: Dockerfile.test
-    entrypoint: ./wait-for-it.sh tidb:4000 -t 600 --
-    command: /bin/sh -c "composer install && vendor/bin/phpunit"
-    volumes:
-      - .:/project:delegated
-    depends_on:
-      - tidb
-  tidb:
-    build:
-      context: .
-      dockerfile: Dockerfile.tidb
-    image: ubuntu:latest
-    command: /bin/sh -c "/root/.tiup/bin/tiup playground --host 0.0.0.0"
-    environment:
-      TZ: "Asia/Tokyo"
diff --git a/wait-for-it.sh b/wait-for-it.sh
deleted file mode 100755
index 071c2be..0000000
--- a/wait-for-it.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
-
-WAITFORIT_cmdname=${0##*/}
-
-echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-
-wait_for()
-{
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    else
-        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
-    fi
-    WAITFORIT_start_ts=$(date +%s)
-    while :
-    do
-        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
-            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
-            WAITFORIT_result=$?
-        else
-            (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
-            WAITFORIT_result=$?
-        fi
-        if [[ $WAITFORIT_result -eq 0 ]]; then
-            WAITFORIT_end_ts=$(date +%s)
-            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $WAITFORIT_result
-}
-
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    fi
-    WAITFORIT_PID=$!
-    trap "kill -INT -$WAITFORIT_PID" INT
-    wait $WAITFORIT_PID
-    WAITFORIT_RESULT=$?
-    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    fi
-    return $WAITFORIT_RESULT
-}
-
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
-        shift 1
-        ;;
-        --child)
-        WAITFORIT_CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        WAITFORIT_QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        WAITFORIT_STRICT=1
-        shift 1
-        ;;
-        -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        WAITFORIT_HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        WAITFORIT_PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        WAITFORIT_TIMEOUT="$2"
-        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        WAITFORIT_TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        WAITFORIT_CLI=("$@")
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-
-WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
-WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
-WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
-WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
-
-# check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-        WAITFORIT_ISBUSY=1
-        WAITFORIT_BUSYTIMEFLAG="-t"
-
-else
-        WAITFORIT_ISBUSY=0
-        WAITFORIT_BUSYTIMEFLAG=""
-fi
-
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
-        wait_for
-        WAITFORIT_RESULT=$?
-    fi
-fi
-
-if [[ $WAITFORIT_CLI != "" ]]; then
-    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
-        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
-        exit $WAITFORIT_RESULT
-    fi
-    exec "${WAITFORIT_CLI[@]}"
-else
-    exit $WAITFORIT_RESULT
-fi