diff --git a/.gitlab-ci/apkbuild-linting.py b/.ci/apkbuild-linting.py
similarity index 100%
rename from .gitlab-ci/apkbuild-linting.py
rename to .ci/apkbuild-linting.py
diff --git a/.gitlab-ci/build.sh b/.ci/build.sh
similarity index 72%
rename from .gitlab-ci/build.sh
rename to .ci/build.sh
index 0e05857d4..75a44a5e0 100755
--- a/.gitlab-ci/build.sh
+++ b/.ci/build.sh
@@ -5,4 +5,4 @@ export PYTHONUNBUFFERED=1
 JOB_ARCH="${CI_JOB_NAME#build-}"
 
 set -x
-su pmos -c ".gitlab-ci/build_changed_aports.py $JOB_ARCH"
+su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"
diff --git a/.gitlab-ci/build_changed_aports.py b/.ci/build_changed_aports.py
similarity index 100%
rename from .gitlab-ci/build_changed_aports.py
rename to .ci/build_changed_aports.py
diff --git a/.gitlab-ci/check_changed_aports_versions.py b/.ci/check_changed_aports_versions.py
similarity index 100%
rename from .gitlab-ci/check_changed_aports_versions.py
rename to .ci/check_changed_aports_versions.py
diff --git a/.gitlab-ci/check_devices_in_wiki.py b/.ci/check_devices_in_wiki.py
similarity index 100%
rename from .gitlab-ci/check_devices_in_wiki.py
rename to .ci/check_devices_in_wiki.py
diff --git a/.gitlab-ci/common.py b/.ci/common.py
similarity index 98%
rename from .gitlab-ci/common.py
rename to .ci/common.py
index 2fd79d8f8..7d939a1b6 100755
--- a/.gitlab-ci/common.py
+++ b/.ci/common.py
@@ -162,7 +162,7 @@ def get_changed_packages():
 
         # Skip files:
         # * in the root dir of pmaports (e.g. README.md)
-        # * path with a dot (e.g. .gitlab-ci/, device/.shared-patches/)
+        # * path with a dot (e.g. .ci/, device/.shared-patches/)
         if not dirname or file.startswith(".") or "/." in file:
             continue
 
diff --git a/.gitlab-ci/move_logs.sh b/.ci/move_logs.sh
similarity index 100%
rename from .gitlab-ci/move_logs.sh
rename to .ci/move_logs.sh
diff --git a/.gitlab-ci/run_testcases.sh b/.ci/run_testcases.sh
similarity index 94%
rename from .gitlab-ci/run_testcases.sh
rename to .ci/run_testcases.sh
index 90715e83c..fddacf22f 100755
--- a/.gitlab-ci/run_testcases.sh
+++ b/.ci/run_testcases.sh
@@ -32,4 +32,4 @@ if ! [ -e $deviceinfo ]; then
 fi
 
 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.gitlab-ci/testcases" "$@"
+pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
diff --git a/.gitlab-ci/shellcheck.sh b/.ci/shellcheck.sh
similarity index 97%
rename from .gitlab-ci/shellcheck.sh
rename to .ci/shellcheck.sh
index 0f925d9f0..ee8dabbae 100755
--- a/.gitlab-ci/shellcheck.sh
+++ b/.ci/shellcheck.sh
@@ -38,7 +38,7 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
-	$(find . -path '.gitlab-ci/*.sh')
+	$(find . -path '.ci/*.sh')
 "
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
diff --git a/.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py b/.ci/testcases/add_pmbootstrap_to_import_path/__init__.py
similarity index 100%
rename from .gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py
rename to .ci/testcases/add_pmbootstrap_to_import_path/__init__.py
diff --git a/.gitlab-ci/testcases/conftest.py b/.ci/testcases/conftest.py
similarity index 100%
rename from .gitlab-ci/testcases/conftest.py
rename to .ci/testcases/conftest.py
diff --git a/.gitlab-ci/testcases/test_device.py b/.ci/testcases/test_device.py
similarity index 100%
rename from .gitlab-ci/testcases/test_device.py
rename to .ci/testcases/test_device.py
diff --git a/.gitlab-ci/testcases/test_deviceinfo.py b/.ci/testcases/test_deviceinfo.py
similarity index 100%
rename from .gitlab-ci/testcases/test_deviceinfo.py
rename to .ci/testcases/test_deviceinfo.py
diff --git a/.gitlab-ci/testcases/test_directory_structure.py b/.ci/testcases/test_directory_structure.py
similarity index 98%
rename from .gitlab-ci/testcases/test_directory_structure.py
rename to .ci/testcases/test_directory_structure.py
index 59637cff7..32e8a4a94 100644
--- a/.gitlab-ci/testcases/test_directory_structure.py
+++ b/.ci/testcases/test_directory_structure.py
@@ -46,7 +46,7 @@ def test_executable_files():
 
 # Make sure files are either:
 #  - in root directory (README.md)
-#  - hidden (.gitlab-ci/, device/.shared-patches/)
+#  - hidden (.ci/, device/.shared-patches/)
 #  - or belong to a package (below a directory with APKBUILD)
 def test_files_belong_to_package():
     # Walk directories and set package_dir when we find an APKBUILD
diff --git a/.gitlab-ci/testcases/test_framework_versions.py b/.ci/testcases/test_framework_versions.py
similarity index 100%
rename from .gitlab-ci/testcases/test_framework_versions.py
rename to .ci/testcases/test_framework_versions.py
diff --git a/.gitlab-ci/testcases/test_kernel.py b/.ci/testcases/test_kernel.py
similarity index 100%
rename from .gitlab-ci/testcases/test_kernel.py
rename to .ci/testcases/test_kernel.py
diff --git a/.gitlab-ci/testcases/test_ui.py b/.ci/testcases/test_ui.py
similarity index 100%
rename from .gitlab-ci/testcases/test_ui.py
rename to .ci/testcases/test_ui.py
diff --git a/.gitlab-ci/testcases/test_unreferenced_files.py b/.ci/testcases/test_unreferenced_files.py
similarity index 100%
rename from .gitlab-ci/testcases/test_unreferenced_files.py
rename to .ci/testcases/test_unreferenced_files.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ba523ca6..7b473db11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .gitlab-ci/move_logs.sh $CI_PROJECT_DIR
+  - .ci/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -34,7 +34,7 @@ wiki:
   before_script:
     - apk -q add python3
   script:
-    - .gitlab-ci/check_devices_in_wiki.py --booting
+    - .ci/check_devices_in_wiki.py --booting
 
 # testcases linting
 testcases-linting:
@@ -44,8 +44,8 @@ testcases-linting:
     refs:
       - merge_requests
     changes:
-      - .gitlab-ci/*
-      - .gitlab-ci/*/*
+      - .ci/*
+      - .ci/*/*
   before_script:
     - apk -q add py-flake8
   script:
@@ -59,7 +59,7 @@ shellcheck:
   before_script:
     - apk -q add shellcheck
   script:
-    - .gitlab-ci/shellcheck.sh
+    - .ci/shellcheck.sh
 
 # aports checks (generic)
 aports-static:
@@ -69,8 +69,8 @@ aports-static:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c ".gitlab-ci/run_testcases.sh"
-    - su pmos -c ".gitlab-ci/check_changed_aports_versions.py"
+    - su pmos -c ".ci/run_testcases.sh"
+    - su pmos -c ".ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -98,7 +98,7 @@ aport-lint:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh
   script:
-    - su pmos -c ".gitlab-ci/apkbuild-linting.py"
+    - su pmos -c ".ci/apkbuild-linting.py"
   only:
     - merge_requests
   allow_failure: true
@@ -139,7 +139,7 @@ mr-settings:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh
   script:
-    - .gitlab-ci/build.sh
+    - .ci/build.sh
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week