diff --git a/tools/packaging/static-build/kernel/Dockerfile b/tools/packaging/static-build/kernel/Dockerfile
index b8b813396..40f3228f0 100644
--- a/tools/packaging/static-build/kernel/Dockerfile
+++ b/tools/packaging/static-build/kernel/Dockerfile
@@ -15,4 +15,6 @@ RUN apt install -y \
 	    flex \
 	    git \
 	    iptables \
-	    libelf-dev \
+	    libelf-dev
+
+RUN [ "$(uname -m)" = "s390x" ] && apt-get install -y libssl-dev || true
diff --git a/tools/packaging/static-build/qemu.blacklist b/tools/packaging/static-build/qemu.blacklist
index 9c621893e..31f6ab23c 100644
--- a/tools/packaging/static-build/qemu.blacklist
+++ b/tools/packaging/static-build/qemu.blacklist
@@ -16,7 +16,6 @@ qemu_black_list=(
 */share/*/efi-rtl8139.rom
 */share/*/efi-vmxnet3.rom
 */share/*/icons
-*/share/*/*.img
 */share/*/keymaps
 */share/*/multiboot.bin
 */share/*/npcm7xx_bootrom.bin
diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile
index fbbb0dad6..cb15ddeac 100644
--- a/tools/packaging/static-build/qemu/Dockerfile
+++ b/tools/packaging/static-build/qemu/Dockerfile
@@ -36,7 +36,6 @@ RUN apt-get --no-install-recommends install -y \
 	    libltdl-dev \
 	    libmount-dev \
 	    libpixman-1-dev \
-	    libpmem-dev \
 	    libselinux1-dev \
 	    libtool \
 	    make \
@@ -49,6 +48,8 @@ RUN apt-get --no-install-recommends install -y \
 	    rsync \
 	    zlib1g-dev
 
+RUN [ "$(uname -m)" != "s390x" ] && apt-get install -y libpmem-dev || true
+
 ARG QEMU_REPO
 
 RUN cd  .. && git clone "${QEMU_REPO}" qemu