diff --git a/.gitlab-ci/check-ddx-build.sh b/.github/scripts/check-ddx-build.sh
similarity index 100%
rename from .gitlab-ci/check-ddx-build.sh
rename to .github/scripts/check-ddx-build.sh
diff --git a/.gitlab-ci/check-piglit-results.sh b/.github/scripts/check-piglit-results.sh
similarity index 100%
rename from .gitlab-ci/check-piglit-results.sh
rename to .github/scripts/check-piglit-results.sh
diff --git a/.gitlab-ci/manpages-check b/.github/scripts/manpages-check
similarity index 100%
rename from .gitlab-ci/manpages-check
rename to .github/scripts/manpages-check
diff --git a/.gitlab-ci/meson-build.sh b/.github/scripts/meson-build.sh
similarity index 100%
rename from .gitlab-ci/meson-build.sh
rename to .github/scripts/meson-build.sh
diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index 63bb17f599..6e322e2e0d 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -55,7 +55,7 @@ jobs:
               run:  .github/scripts/install-prereq.sh
 
             - name: build
-              run:  .gitlab-ci/meson-build.sh
+              run:  .github/scripts/meson-build.sh
 
             - name: tests
               run:  meson test -C "${{ env.MESON_BUILDDIR }}" --print-errorlogs
@@ -72,9 +72,9 @@ jobs:
                       build/test/piglit-results/*
 
             - name: ddx build check
-              run:  .gitlab-ci/check-ddx-build.sh
+              run:  .github/scripts/check-ddx-build.sh
             - name: manpage check
-              run:  .gitlab-ci/manpages-check
+              run:  .github/scripts/manpages-check
 
     drivers-build-ubuntu:
         env:
@@ -119,7 +119,7 @@ jobs:
                 echo -n > .meson_environment
                 echo "export MESON_BUILDDIR=$MESON_BUILDDIR" >> .meson_environment
                 echo "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> .meson_environment
-                .gitlab-ci/meson-build.sh --skip-test
+                .github/scripts/meson-build.sh --skip-test
                 sudo meson install --no-rebuild -C "$MESON_BUILDDIR"
                 sudo mkdir -p /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
                 sudo chown -R runner /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
@@ -165,7 +165,7 @@ jobs:
               run:  .github/scripts/install-prereq.sh
 
             - name: build
-              run:  .gitlab-ci/meson-build.sh
+              run:  .github/scripts/meson-build.sh
 
             - name: tests (may fail)
               continue-on-error: true
@@ -183,9 +183,9 @@ jobs:
                       build/test/piglit-results/*
 
             - name: ddx build check
-              run:  .gitlab-ci/check-ddx-build.sh
+              run:  .github/scripts/check-ddx-build.sh
             - name: manpage check
-              run:  .gitlab-ci/manpages-check
+              run:  .github/scripts/manpages-check
 
     release:
         name: Release pushed tag
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f208bd1195..33d0fe1842 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,10 +166,10 @@ freebsd-image:
 meson:
     extends: .common-build-and-test
     script:
-        - .gitlab-ci/meson-build.sh --run-test
-        - .gitlab-ci/check-piglit-results.sh
-        - .gitlab-ci/manpages-check
-        - .gitlab-ci/check-ddx-build.sh
+        - .github/scripts/meson-build.sh --run-test
+        - .github/scripts/check-piglit-results.sh
+        - .github/scripts/manpages-check
+        - .github/scripts/check-ddx-build.sh
     variables:
       XTEST_DIR: /root/xts
       PIGLIT_DIR: /root/piglit
@@ -190,7 +190,7 @@ meson-noglamor:
 mingw-cross-build:
     extends: .common-build-and-test
     script:
-        - .gitlab-ci/meson-build.sh --run-install
+        - .github/scripts/meson-build.sh --run-install
     variables:
       MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dlisten_tcp=true -Dxvmc=true -Dxv=true
 
@@ -212,7 +212,7 @@ freebsd:
       - /app/vmctl exec "pkg update && pkg add libxvmc xcb-util xcb-util-wm"
       # need to install newer xorgproto
       - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install"
-      - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success
+      - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .github/scripts/meson-build.sh --skip-test" && touch .success
       # test not working yet, so skipped
       # - scp -r vm:$CI_PROJECT_NAME/test-results.xml .
       - /app/vmctl stop
@@ -228,10 +228,10 @@ meson-dist:
             - $MESON_BUILDDIR/xserver-*/$MESON_BUILDDIR/meson-logs/
             - xserver-tarball/install/
     script:
-        - .gitlab-ci/meson-build.sh --run-dist
+        - .github/scripts/meson-build.sh --run-dist
         - mkdir xserver-tarball
         - tar xf $MESON_BUILDDIR/meson-dist/xserver-*.tar.xz -C xserver-tarball --strip-components=1
-        - .gitlab-ci/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install
+        - .github/scripts/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install
     variables:
       MESON_DIST_ARGS: --no-tests
       MESON_EXTRA_ARGS: -Dprefix=$CI_PROJECT_DIR/xserver-tarball/install/
@@ -349,7 +349,7 @@ xf86-driver-build-test:
         - git -C "$DRIVER" checkout "$SHA"
         - |
           if [[ -e "$DRIVER/meson.build" ]] && [[ "$DRIVER" != "xf86-video-intel" ]]; then
-            .gitlab-ci/meson-build.sh -C "$DRIVER" --skip-test
+            .github/scripts/meson-build.sh -C "$DRIVER" --skip-test
           else
              pushd "$DRIVER" || exit 1
              ./autogen.sh && make