diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6c731203bf5bc57302ff439de096d3b72839dc9..a0fab1a7ffec799d82b76b7826512031207ea066 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,9 +72,10 @@ package-debian-job:
     - ${VERAPDF_UNZIP_DIR}/verapdf-install "${AUTO_INSTALL_XML_PATH}"
     # test call verapdf
     - ${INSTALL_PATH_VERAPDF_DEB}/verapdf --version | grep "${VERAPDF_VERSION}"
-    # retrieve version infos
+    # retrieve or set additional version infos
     - REVISION="1"
     - ARCHITECTURE="all"
+    - VERSION="${VERAPDF_VERSION}"
     # create build dir structure
     - DEB_BUILD_DIR="verapdf_${VERAPDF_VERSION}-${REVISION}_${ARCHITECTURE}"
     - mkdir -p ${DEB_BUILD_DIR}/DEBIAN
@@ -86,7 +87,8 @@ package-debian-job:
     - ln -s "${INSTALL_PATH_VERAPDF_DEB}/verapdf" "${DEB_BUILD_DIR}/usr/local/bin/verapdf"
     - ln -s "${INSTALL_PATH_VERAPDF_DEB}/verapdf-gui" "${DEB_BUILD_DIR}/usr/local/bin/verapdf-gui"
     # create deb control file from template
-    - sed "s#VERSION_PLACEHOLDER#${VERAPDF_VERSION}-${REVISION}#g" gitlab-ci/verapdf.control > "${DEB_BUILD_DIR}/DEBIAN/control"
+    - sed "s#VERSION_PLACEHOLDER#${VERSION}-${REVISION}#g" gitlab-ci/verapdf.control > "${DEB_BUILD_DIR}/DEBIAN/control"
+    - sed -i "s#ARCHITECTURE_PLACEHOLDER#${ARCHITECTURE_PLACEHOLDER}#g" "${DEB_BUILD_DIR}/DEBIAN/control"
     # add checksums
     - pushd ${DEB_BUILD_DIR}
     - find * -type f -not -path 'DEBIAN/*' -exec md5sum \{\} \; | sort -k2 > DEBIAN/md5sums
diff --git a/gitlab-ci/verapdf.control b/gitlab-ci/verapdf.control
index fe667555341133b64026bd142e94521229124a86..b30b3d35a39fc3008ea82a9a6a322a5e5e2620e3 100644
--- a/gitlab-ci/verapdf.control
+++ b/gitlab-ci/verapdf.control
@@ -1,6 +1,6 @@
 Package: verapdf
 Version: VERSION_PLACEHOLDER
-Architecture: all
+Architecture: ARCHITECTURE_PLACEHOLDER
 Maintainer: SLUBArchiv.digital <langzeitarchiv@slub-dresden.de>
 Description: veraPDF is a purpose-built, open source, file-format validator covering all PDF/A and PDF/UA parts and conformance levels.
 Homepage: https://git.slub-dresden.de/digital-preservation/verapdf_package_build