diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d488f04..d9ab7f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,8 +76,8 @@ test_acceptance_prebuilt_raspberrypi:
     - aws s3 cp s3://mender-gitlab-tmp-storage/$CI_PROJECT_NAME/$CI_PIPELINE_ID/deploy.tar.gz deploy.tar.gz
     - tar xzf deploy.tar.gz
     # Extract converted Raspbian artifacts
-    - unxz deploy/raspberrypi-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}-mender.img.xz
-    - ./scripts/test/run-tests.sh --no-pull --prebuilt-image raspberrypi ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}
+    - unxz deploy/raspberrypi3-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}-mender.img.xz
+    - ./scripts/test/run-tests.sh --no-pull --prebuilt-image raspberrypi3 ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}
 
 test_acceptance_qemux86_64:
   <<: *test_acceptance
@@ -87,7 +87,7 @@ test_acceptance_qemux86_64:
 test_acceptance_raspberrypi:
   <<: *test_acceptance
   script:
-    - ./scripts/test/run-tests.sh --no-pull --only raspberrypi
+    - ./scripts/test/run-tests.sh --no-pull --only raspberrypi3
 
 test_acceptance_linaro-alip:
   <<: *test_acceptance
@@ -148,12 +148,12 @@ publish:s3:
     - export AWS_ACCESS_KEY_ID=$PUBLISH_AWS_ACCESS_KEY_ID
     - export AWS_SECRET_ACCESS_KEY=$PUBLISH_AWS_SECRET_ACCESS_KEY
     - echo "Publishing ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.img.xz version to S3"
-    - aws s3 cp deploy/raspberrypi-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}-mender.img.xz
+    - aws s3 cp deploy/raspberrypi3-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}-mender.img.xz
         s3://$S3_BUCKET_NAME/${RASPBIAN_NAME}/arm/${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.img.xz
     - aws s3api put-object-acl --acl public-read --bucket $S3_BUCKET_NAME
         --key ${RASPBIAN_NAME}/arm/${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.img.xz
     - echo "Publishing ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.mender version to S3"
-    - aws s3 cp deploy/raspberrypi-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.mender
+    - aws s3 cp deploy/raspberrypi3-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.mender
         s3://$S3_BUCKET_NAME/${RASPBIAN_NAME}/arm/${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.mender
     - aws s3api put-object-acl --acl public-read --bucket $S3_BUCKET_NAME
         --key ${RASPBIAN_NAME}/arm/${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.mender
diff --git a/configs/raspberrypi0w_config b/configs/raspberrypi0w_config
index fe6c37b..b772e32 100644
--- a/configs/raspberrypi0w_config
+++ b/configs/raspberrypi0w_config
@@ -1,5 +1,6 @@
 RASPBERRYPI_CONFIG="raspberrypi0w"
 RASPBERRYPI_KERNEL_IMAGE="kernel.img"
 MENDER_KERNEL_IMAGETYPE=zImage
+MENDER_DEVICE_TYPE="raspberrypi0w"
 
 source configs/raspberrypi_config
diff --git a/configs/raspberrypi3_config b/configs/raspberrypi3_config
index 72f3ae7..7bfe575 100644
--- a/configs/raspberrypi3_config
+++ b/configs/raspberrypi3_config
@@ -1,5 +1,6 @@
 RASPBERRYPI_CONFIG="raspberrypi3"
 RASPBERRYPI_KERNEL_IMAGE="kernel7.img"
 MENDER_KERNEL_IMAGETYPE="zImage"
+MENDER_DEVICE_TYPE="raspberrypi3"
 
 source configs/raspberrypi_config
diff --git a/configs/raspberrypi4_config b/configs/raspberrypi4_config
index 37ec451..593641e 100644
--- a/configs/raspberrypi4_config
+++ b/configs/raspberrypi4_config
@@ -1,5 +1,6 @@
 RASPBERRYPI_CONFIG="raspberrypi4"
 RASPBERRYPI_KERNEL_IMAGE="kernel7l.img"
 MENDER_KERNEL_IMAGETYPE="zImage"
+MENDER_DEVICE_TYPE="raspberrypi4"
 
 source configs/raspberrypi_config
diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh
index 05456f0..0ae4649 100755
--- a/scripts/test/run-tests.sh
+++ b/scripts/test/run-tests.sh
@@ -68,8 +68,8 @@ else
                      "configs/qemux86-64_config" || test_result=$?
   fi
 
-  if [ "$1" == "--all" -o "$1" == "--only" -a "$2" == "raspberrypi" ]; then
-    convert_and_test "raspberrypi" \
+  if [ "$1" == "--all" -o "$1" == "--only" -a "$2" == "raspberrypi3" ]; then
+    convert_and_test "raspberrypi3" \
                      "release-1" \
                      "${RASPBIAN_IMAGE_URL}" \
                      "${RASPBIAN_IMAGE}.img" \
@@ -96,7 +96,7 @@ else
   fi
 
   if [ "$1" == "--all" -o "$1" == "--only" -a "$2" == "ubuntu" ]; then
-    convert_and_test "ubuntu" \
+    convert_and_test "raspberrypi3" \
                      "release-1" \
                      "${UBUNTU_SERVER_RPI_IMAGE_URL}" \
                      "${UBUNTU_SERVER_RPI_IMAGE}" \