diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50ad36823..3eae8cf63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,9 +85,10 @@ aports-static:
 aport-lint:
   stage: first
   before_script:
-    - apk -q add git atools python3
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh
   script:
-    - .gitlab-ci/apkbuild-linting.py
+    - su pmos -c ".gitlab-ci/apkbuild-linting.py"
   only:
     - merge_requests
   allow_failure: true
diff --git a/.gitlab-ci/apkbuild-linting.py b/.gitlab-ci/apkbuild-linting.py
index 6c031e1e5..b3a4c9152 100755
--- a/.gitlab-ci/apkbuild-linting.py
+++ b/.gitlab-ci/apkbuild-linting.py
@@ -3,7 +3,6 @@
 
 import common
 import os.path
-import subprocess
 import sys
 
 if __name__ == "__main__":
@@ -20,9 +19,10 @@ if __name__ == "__main__":
             print(f"NOTE: Skipping linting of {apkbuild}")
             continue
 
-        result = subprocess.run(["apkbuild-lint", apkbuild], capture_output=True)
-        if len(result.stdout) > 0:
-            issues.append([apkbuild, result.stdout.decode("utf-8")])
+        package = os.path.basename(os.path.dirname(apkbuild))
+        result = common.run_pmbootstrap(["-q", "lint", package], output_return=True)
+        if len(result) > 0:
+            issues.append([apkbuild, result])
 
     if len(issues) > 0:
         print("Linting issues found:")