diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6f7b0f..afed37b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,10 +6,11 @@ jobs:
     steps:
       - name: Checkout subservient
         uses: actions/checkout@v2
+      - name: Build with Openlane
+        uses: librecores/ci-fusesoc-action@migrate-dockerized
         with:
-          path: subservient
-      - run: echo "EDALIZE_LAUNCHER=${GITHUB_WORKSPACE}/subservient/.github/workflows/openlane_runner.py" >> $GITHUB_ENV
-      - run: pip3 install fusesoc
-      - run: fusesoc library add serv https://github.com/olofk/serv
-      - run: fusesoc library add subservient $GITHUB_WORKSPACE/subservient
-      - run: fusesoc run --target=sky130 subservient
+          libraries: https://github.com/olofk/serv
+          core: subservient
+          target: sky130
+          tool: openlane
+
diff --git a/.github/workflows/openlane_runner.py b/.github/workflows/openlane_runner.py
deleted file mode 100755
index 5ef3ebf..0000000
--- a/.github/workflows/openlane_runner.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python3
-import os
-import subprocess
-import sys
-
-if 'flow.tcl' in sys.argv[1]:
-    (build_root, work) = os.path.split(os.getcwd())
-
-    image = "edalize/openlane-sky130:v0.12"
-
-    prefix = ["docker", "run",
-              "-v", f"{build_root}:/project",
-              "-u", f"{os.getuid()}:{os.getgid()}",
-              "-w", f"/project/{work}",
-              image]
-    sys.exit(subprocess.call(prefix+sys.argv[1:]))