diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 884d844..72f1021 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,12 +17,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Prepare
+        run: |
+          echo UID=`id -u` >> $GITHUB_ENV
+          echo GID=`id -g` >> $GITHUB_ENV
+      - name: Build
+        run: docker-compose build
+        env:
+          PHP_VERSION: ${{ matrix.php_version }}
       - name: Install
-        uses: php-actions/composer@v5
-        with:
-          php_version: ${{ matrix.php_version }}
+        run: docker-compose run romans composer install
       - name: Test
-        uses: php-actions/composer@v5
-        with:
-          php_version: ${{ matrix.php_version }}
-          command: test
+        run: docker-compose run romans composer test
+      - name: Clean
+        run: docker-compose down
diff --git a/README.md b/README.md
index 86d1616..4a88939 100644
--- a/README.md
+++ b/README.md
@@ -65,11 +65,9 @@ You can use Docker Compose to build an image and run a container to develop and
 test this package.
 
 ```bash
-docker-compose up --detach
-
-docker-compose exec romans composer install
-
-docker-compose exec romans composer test
+docker-compose build
+docker-compose run romans composer install
+docker-compose run romans composer test
 ```
 
 ## License
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b70818..4030f9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,10 @@ version: "3.8"
 services:
 
   romans:
-    build: "./docker-compose"
+    build:
+      context: "./docker-compose"
+      args:
+        PHP_VERSION: "${PHP_VERSION:-8.0}"
     volumes:
     - ".:/app"
     user: "${UID:-1000}:${GID:-1000}"
diff --git a/docker-compose/Dockerfile b/docker-compose/Dockerfile
index aaf043c..8ab7d66 100644
--- a/docker-compose/Dockerfile
+++ b/docker-compose/Dockerfile
@@ -1,4 +1,6 @@
-FROM php:7.4-cli-alpine
+ARG PHP_VERSION
+
+FROM php:${PHP_VERSION}-cli-alpine
 
 ENV COMPOSER_CACHE_DIR /tmp