diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a0af05b..5a12abb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,6 +104,12 @@ check-commit:
     KERNEL_IMAGE: "bzImage"
     KERNEL_DEFCONFIG: "x86_64_defconfig"
 
+.debian-armv7:
+  extends:
+    - .os-debian
+  variables:
+    BUILD_ARCH: "armv7"
+
 .debian-aarch64:
   extends:
     - .os-debian
@@ -124,6 +130,18 @@ x86_64-debian-container_prep:
   timeout: 30m
   stage: container_prep
 
+armv7-debian-container_prep:
+  extends:
+    - .ci-rules
+    - .debian-armv7
+    - .fdo.container-build@debian
+  tags:
+    - aarch64
+  variables:
+    FDO_BASE_IMAGE: "arm32v7/debian:$FDO_DISTRIBUTION_VERSION"
+  timeout: 30m
+  stage: container_prep
+
 aarch64-debian-container_prep:
   extends:
     - .ci-rules
@@ -205,6 +223,17 @@ aarch64-debian-container_prep:
     - job: x86_64-debian-container_prep
       artifacts: false
 
+.build-env-debian-armv7:
+  tags:
+    - aarch64
+  extends:
+    - .debian-armv7
+    - .fdo.suffixed-image@debian
+    - .build-env
+  needs:
+    - job: armv7-debian-container_prep
+      artifacts: false
+
 .build-env-debian-aarch64:
   tags:
     - aarch64
@@ -290,6 +319,12 @@ x86_64-debian-no-gl-build:
     - .test-env-debian-x86_64
     - .build-options-no-gl
 
+armv7-debian-no-gl-build:
+  extends:
+    - .build-env-debian-armv7
+    - .build-no-test
+    - .build-options-no-gl
+
 aarch64-debian-no-gl-build:
   extends:
     - .test-env-debian-aarch64