diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ecf5402..c2b6cee 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -2,22 +2,29 @@ name: Test
 on: push
 
 jobs:
-  test:
+  flake8:
     runs-on: self-hosted
-    container: python:3.8-bullseye
+    container: ghcr.io/oxionics/poetry:1.6
+    name: Flake8
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: OxIonics/poetry-preamble@master
+        with:
+          INSTALL_ARGS: ${{ inputs.INSTALL_ARGS }}
+          GHA_TOKEN: ${{ secrets.GHA_TOKEN }}
 
-      - name: Install poetry
-        run: python -m pip install poetry==1.1.12 poethepoet==0.10.0
+      - name: Flake8
+        run: $POETRY run flake8 .
 
-      - name: Install dependencies
-        run: poetry install
-
-      - name: Check formatting
-        run: poe fmt-test
+  black:
+    runs-on: self-hosted
+    container: ghcr.io/oxionics/poetry:1.6
+    name: Formatting check
+    steps:
+      - uses: OxIonics/poetry-preamble@master
+        with:
+          INSTALL_ARGS: ${{ inputs.INSTALL_ARGS }}
+          GHA_TOKEN: ${{ secrets.GHA_TOKEN }}
 
-      - name: Check syntax
-        run: poe flake
+      - name: Black check
+        run: $POETRY run black --check .