diff --git a/tools/packaging/obs-packaging/qemu-vanilla/debian.control-template b/tools/packaging/obs-packaging/qemu-vanilla/debian.control-template
index f2f1206739..5a4d30d0fb 100644
--- a/tools/packaging/obs-packaging/qemu-vanilla/debian.control-template
+++ b/tools/packaging/obs-packaging/qemu-vanilla/debian.control-template
@@ -2,7 +2,7 @@ Source: qemu-vanilla
 Section: devel
 Priority: optional
 Maintainer: Kata containers team <https://github.com/kata-containers/>
-Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev
+Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python3-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev, libselinux1-dev, libffi-dev, libmount-dev, libblkid-dev
 Standards-Version: 3.9.6
 Homepage: https://katacontainers.io
 
@@ -11,4 +11,3 @@ Architecture: @deb_arch@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
 Description: linux kernel optimised for container-like workloads.
  Linux kernel optimised for container-like workloads
-
diff --git a/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.dsc-template b/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.dsc-template
index 70da62338a..b5261bb2e2 100644
--- a/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.dsc-template
+++ b/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.dsc-template
@@ -4,7 +4,7 @@ Version: @VERSION@+git.@QEMU_VANILLA_HASH@-@RELEASE@
 Section: devel
 Priority: optional
 Maintainer: Kata containers team <https://github.com/kata-containers/>
-Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev, librbd-dev
+Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python3-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev, librbd-dev, libselinux1-dev, libffi-dev, libmount-dev, libblkid-dev
 Standards-Version: 3.9.6
 Homepage: https://katacontainers.io
 Debtransform-Tar: qemu-vanilla-@VERSION@+git.@QEMU_VANILLA_HASH@.tar.gz
diff --git a/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template b/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template
index 38c61a923d..84fa6f33ed 100644
--- a/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template
+++ b/tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template
@@ -30,12 +30,18 @@ BuildRequires : findutils
 
 %if 0%{?centos_version}
 BuildRequires : librbd1-devel
+BuildRequires : libmount
 %else
 
 %if ! 0%{?rhel_version}
 BuildRequires : librbd-devel
 %endif
 
+BuildRequires : libselinux-devel
+BuildRequires : libffi-devel
+BuildRequires : libmount-devel
+BuildRequires : libblkid-devel
+
 %endif
 
 %if 0%{?suse_version}
@@ -44,13 +50,8 @@ BuildRequires : libnuma-devel
 BuildRequires : numactl-devel
 %endif
 
-%if 0%{?centos} < 8
-BuildRequires : python
-BuildRequires : python-devel
-%else
 BuildRequires : python3
 BuildRequires : python3-devel
-%endif
 BuildRequires : zlib-devel
 BuildRequires : pkgconfig(pixman-1)
 BuildRequires : libpmem-devel
diff --git a/tools/packaging/snap/snapcraft.yaml b/tools/packaging/snap/snapcraft.yaml
index 7a10b73f02..3dda650e43 100644
--- a/tools/packaging/snap/snapcraft.yaml
+++ b/tools/packaging/snap/snapcraft.yaml
@@ -338,6 +338,10 @@ parts:
       - curl
       - libcapstone-dev
       - bc
+      - libblkid-dev
+      - libffi-dev
+      - libmount-dev
+      - libselinux1-dev
     override-build: |
       kata_version=$(cat ${SNAPCRAFT_STAGE}/kata_version)
       yq=$(realpath ../../yq/build/yq)