diff --git a/.github/workflows/test-self-hosted.yml b/.github/workflows/test-self-hosted.yml
index 4c18a30..a89b414 100644
--- a/.github/workflows/test-self-hosted.yml
+++ b/.github/workflows/test-self-hosted.yml
@@ -7,8 +7,6 @@ jobs:
     runs-on:
       - self-hosted
     timeout-minutes: 10
-    container:
-      image: ghcr.io/actions/actions-runner:latest
     steps:
       - run: ls
       - run: pwd
@@ -20,13 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flash-attn-version: ["2.4.3"]
+        flash-attn-version: ["2.4.3", "2.5.9"]
         python-version: ["3.12"]
         torch-version: ["2.7.0"]
         # https://developer.nvidia.com/cuda-toolkit-archive
         cuda-version: ["12.8.1"]
-    container:
-      image: ghcr.io/actions/actions-runner
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
diff --git a/self-hosted-runner/Dockerfile b/self-hosted-runner/Dockerfile
index cc08e75..973962e 100644
--- a/self-hosted-runner/Dockerfile
+++ b/self-hosted-runner/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
 ARG REPOSITORY_URL
 ARG PERSONAL_ACCESS_TOKEN
@@ -29,20 +29,23 @@ RUN install -m 0755 -d /etc/apt/keyrings \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     docker-ce-cli \
+    # docker-ce \
+    # containerd.io \
+    # docker-buildx-plugin \
+    # docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/*
 
 # Install dotnet
 RUN add-apt-repository ppa:dotnet/backports
 
-# Create runner user and setup group
-RUN useradd -mr -d /home/runner runner \
-    && usermod -aG sudo runner
+# ubuntu >= 24.04 image has user named 'ubuntu'
+RUN usermod -aG sudo ubuntu
 
 # Allow sudo without password
 RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
-USER runner
-WORKDIR /home/runner
+USER ubuntu
+WORKDIR /home/ubuntu
 
 RUN curl -fsSL -o actions-runner.tar.gz -L "https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-${TARGET_ARCH}-${GH_RUNNER_VERSION}.tar.gz" \
     && tar xf actions-runner.tar.gz \
@@ -55,7 +58,7 @@ RUN curl -fsSL -o actions-runner.tar.gz -L "https://github.com/actions/runner/re
     --name $RUNNER_NAME \
     --runnergroup $RUNNER_GROUP \
     --labels "${RUNNER_LABELS},${TARGET_ARCH}" \
-    --work /home/runner/actions-runner \
+    --work /home/ubuntu/actions-runner \
     --replace
 
 CMD ["./run.sh"]
\ No newline at end of file
diff --git a/self-hosted-runner/compose.yml b/self-hosted-runner/compose.yml
index a1c4162..9c6eef6 100644
--- a/self-hosted-runner/compose.yml
+++ b/self-hosted-runner/compose.yml
@@ -4,8 +4,9 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        PERSONAL_ACCESS_TOKEN: $PERSONAL_ACCESS_TOKEN
         REPOSITORY_URL: https://github.com/mjun0812/flash-attention-prebuild-wheels
+        PERSONAL_ACCESS_TOKEN: $PERSONAL_ACCESS_TOKEN
+        GH_RUNNER_VERSION: 2.324.0
         RUNNER_NAME: self-hosted-runner
         RUNNER_GROUP: default
         RUNNER_LABELS: self-hosted