diff --git a/ci/ci-build-centos7 b/ci/ci-build-centos7
index 7ba9e187..c8e39fd0 100755
--- a/ci/ci-build-centos7
+++ b/ci/ci-build-centos7
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Usage: $0 [branch]
+# Usage: $0 [branch] [configure options]
 # Create source tarball from HEAD or given branch and build it in Centos 7 CI
-# environment
+# environment. Configure options follow branch name that can be empty.
 
 HERE=`pwd`
 if [ -f "configure.ac" ]; then
@@ -16,6 +16,7 @@ fi
 
 CIIMAGEDIR=ci/images/ci-centos-7-x86_64
 BRANCH=${1:-HEAD}
+shift
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
@@ -28,4 +29,4 @@ gzip --force --best devel.tar
 cd "$CIIMAGEDIR"
 cp "$SOURCEDIR/devel.tar.gz" .
 ./docker-build
-./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev
+./docker-run -- ./test-build devel --disable-documentation --disable-libudev "$@"
diff --git a/ci/ci-build-centos8 b/ci/ci-build-centos8
index c1a7a524..05f24257 100755
--- a/ci/ci-build-centos8
+++ b/ci/ci-build-centos8
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Usage: $0 [branch]
+# Usage: $0 [branch] [configure options]
 # Create source tarball from HEAD or given branch and build it in Centos 8 CI
-# environment
+# environment. Configure options follow branch name that can be empty.
 
 HERE=`pwd`
 if [ -f "configure.ac" ]; then
@@ -16,6 +16,7 @@ fi
 
 CIIMAGEDIR=ci/images/ci-centos-8-x86_64
 BRANCH=${1:-HEAD}
+shift
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
@@ -28,4 +29,4 @@ gzip --force --best devel.tar
 cd "$CIIMAGEDIR"
 cp "$SOURCEDIR/devel.tar.gz" .
 ./docker-build
-./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev --disable-zoned
+./docker-run -- ./test-build devel --disable-documentation --disable-libudev --disable-zoned "$@"
diff --git a/ci/images/ci-centos-7-x86_64/Dockerfile b/ci/images/ci-centos-7-x86_64/Dockerfile
index f1f703e3..ccf0bc2d 100644
--- a/ci/images/ci-centos-7-x86_64/Dockerfile
+++ b/ci/images/ci-centos-7-x86_64/Dockerfile
@@ -20,6 +20,8 @@ RUN yum -y install wget
 RUN yum -y install coreutils util-linux e2fsprogs findutils grep
 RUN yum -y install udev device-mapper acl attr xz
 
+RUN yum -y install libsodium-devel
+
 # For debugging
 RUN yum -y install less vim
 
diff --git a/ci/images/ci-centos-8-x86_64/Dockerfile b/ci/images/ci-centos-8-x86_64/Dockerfile
index 37536ee7..edc9ed90 100644
--- a/ci/images/ci-centos-8-x86_64/Dockerfile
+++ b/ci/images/ci-centos-8-x86_64/Dockerfile
@@ -23,6 +23,8 @@ RUN yum -y install wget
 RUN yum -y install util-linux e2fsprogs findutils grep
 RUN yum -y install udev device-mapper acl attr xz
 
+RUN yum -y install libsodium-devel
+
 # For debugging
 RUN yum -y install less vim