diff --git a/.gitlab-ci/container/debian/arm64_test-base.sh b/.gitlab-ci/container/debian/arm64_test-base.sh
new file mode 100644
index 00000000000..6cdafba64e4
--- /dev/null
+++ b/.gitlab-ci/container/debian/arm64_test-base.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+DEBIAN_ARCH=arm64 \
+. .gitlab-ci/container/debian/test-base.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-gl.sh b/.gitlab-ci/container/debian/arm64_test-gl.sh
new file mode 100644
index 00000000000..ad650371a26
--- /dev/null
+++ b/.gitlab-ci/container/debian/arm64_test-gl.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. .gitlab-ci/container/debian/test-gl.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-vk.sh b/.gitlab-ci/container/debian/arm64_test-vk.sh
new file mode 100644
index 00000000000..58b04fd5268
--- /dev/null
+++ b/.gitlab-ci/container/debian/arm64_test-vk.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. .gitlab-ci/container/debian/test-vk.sh
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 761d4d16223..9c15a5e83c8 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -198,6 +198,28 @@ debian/x86_64_test-base:
   needs:
     - debian/x86_64_test-base
 
+# Debian based aarch64 test image base
+debian/arm64_test-base:
+  tags:
+    - aarch64
+  extends:
+    - .debian-container
+  variables:
+    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+
+.use-debian/arm64_test-base:
+  tags:
+    - aarch64
+  extends:
+    - .fdo.container-build@debian
+    - .debian-container-version
+    - .use-base-image
+  variables:
+    MESA_BASE_IMAGE: ${DEBIAN_ARM64_TEST_BASE_IMAGE}
+    MESA_BASE_TAG: *debian-arm64_test-base
+  needs:
+    - debian/arm64_test-base
+
 # Debian based x86_64 test image for GL
 debian/x86_64_test-gl:
   extends: .use-debian/x86_64_test-base
@@ -247,6 +269,46 @@ debian/x86_64_test-vk:
   needs:
     - debian/x86_64_test-android
 
+# Debian based aarch64 test image for GL
+debian/arm64_test-gl:
+  tags:
+    - aarch64
+  extends: .use-debian/arm64_test-base
+  variables:
+    MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG}
+
+.use-debian/arm64_test-gl:
+  tags:
+    - aarch64
+  extends:
+    - .set-image-base-tag
+  variables:
+    MESA_BASE_TAG: *debian-arm64_test-base
+    MESA_IMAGE_PATH: ${DEBIAN_ARM64_TEST_IMAGE_GL_PATH}
+    MESA_IMAGE_TAG: *debian-arm64_test-gl
+  needs:
+    - debian/arm64_test-gl
+
+# Debian based aarch64 test image for VK
+debian/arm64_test-vk:
+  tags:
+    - aarch64
+  extends: .use-debian/arm64_test-base
+  variables:
+    MESA_IMAGE_TAG: &debian-arm64_test-vk ${DEBIAN_TEST_VK_TAG}
+
+.use-debian/arm64_test-vk:
+  tags:
+    - aarch64
+  extends:
+    - .set-image-base-tag
+  variables:
+    MESA_BASE_TAG: *debian-arm64_test-base
+    MESA_IMAGE_PATH: ${DEBIAN_ARM64_TEST_IMAGE_VK_PATH}
+    MESA_IMAGE_TAG: *debian-arm64_test-vk
+  needs:
+    - debian/arm64_test-vk
+
 # Debian based ARM build image
 debian/arm64_build:
   extends:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 445f6d86cf3..90a585182fd 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,9 +19,12 @@ variables:
    DEBIAN_BUILD_TAG: "20240509-bindgen"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
+   DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
 
    DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
+   DEBIAN_ARM64_TEST_IMAGE_GL_PATH: "debian/arm64_test-gl"
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
+   DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"