diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9d6c3033bcd0af3683e2fc528db41f1306d8a58..513d7da9a82974ad0bdba5acc475a158934b0930 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,3 +171,40 @@ upload/ubuntu/bionic:
   <<: *upload
   dependencies:
   - build/ubuntu/bionic
+
+###################################
+# Raspbian
+###################################
+build/raspbian/bullseye:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: raspbian/bullseye
+
+test/raspbian/bullseye:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: raspbian/bullseye
+  dependencies:
+    - build/raspbian/bullseye
+
+upload/raspbian/bullseye:
+  <<: *upload
+  dependencies:
+    - build/raspbian/bullseye
+
+build/raspbian/buster:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: raspbian/buster
+
+test/raspbian/buster:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: raspbian/buster
+  dependencies:
+    - build/raspbian/buster
+
+upload/raspbian/buster:
+  <<: *upload
+  dependencies:
+    - build/raspbian/buster
diff --git a/debian/control b/debian/control
index 8de819f6daec118e6afa07d35b93f8e6cdf24da1..1b7629174e8ed4b0ecc7b786edf46e4cde2e02f7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.8
 Maintainer: Henrik Triem <henrik.triem@icinga.com>
 
 Package: icinga-php-common
-Architecture: all
+Architecture: any
 Depends:
  ${misc:Depends}
 Description: Icinga PHP Common for Icinga Web 2