diff --git a/Dockerfile b/Dockerfile
index 735c47e415..3a22f325e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,13 +40,13 @@ FROM base AS criu
 ARG DEBIAN_FRONTEND
 # Install dependency packages specific to criu
 RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcap-dev \
         libnet-dev \
+        libnl-3-dev \
         libprotobuf-c-dev \
         libprotobuf-dev \
-        libnl-3-dev \
-        libcap-dev \
-        protobuf-compiler \
         protobuf-c-compiler \
+        protobuf-compiler \
         python-protobuf \
     && rm -rf /var/lib/apt/lists/*
 
@@ -112,14 +112,14 @@ FROM base AS cross-false
 
 FROM base AS cross-true
 ARG DEBIAN_FRONTEND
-RUN dpkg --add-architecture armhf
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture armel
+RUN dpkg --add-architecture armhf
 RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \
         apt-get update && apt-get install -y --no-install-recommends \
-        crossbuild-essential-armhf \
         crossbuild-essential-arm64 \
         crossbuild-essential-armel \
+        crossbuild-essential-armhf \
         && rm -rf /var/lib/apt/lists/*; \
     fi
 
@@ -140,12 +140,12 @@ ARG DEBIAN_FRONTEND
 # other architectures cannnot crossbuild amd64.
 RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \
         apt-get update && apt-get install -y --no-install-recommends \
-            libseccomp-dev:armhf \
-            libseccomp-dev:arm64 \
-            libseccomp-dev:armel \
-            libapparmor-dev:armhf \
             libapparmor-dev:arm64 \
             libapparmor-dev:armel \
+            libapparmor-dev:armhf \
+            libseccomp-dev:arm64 \
+            libseccomp-dev:armel \
+            libseccomp-dev:armhf \
             # install this arches seccomp here due to compat issues with the v0 builder
             # This is as opposed to inheriting from runtime-dev-cross-false
             libapparmor-dev \
@@ -255,15 +255,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         apparmor \
         aufs-tools \
         bash-completion \
+        binutils-mingw-w64 \
         btrfs-tools \
+        bzip2 \
+        g++-mingw-w64-x86-64 \
         iptables \
         jq \
         libcap2-bin \
         libdevmapper-dev \
-        libudev-dev \
+        libnet1 \
+        libnl-3-200 \
+        libprotobuf-c1 \
         libsystemd-dev \
-        binutils-mingw-w64 \
-        g++-mingw-w64-x86-64 \
+        libudev-dev \
         net-tools \
         pigz \
         python3-pip \
@@ -273,12 +277,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         vim \
         vim-common \
         xfsprogs \
-        zip \
-        bzip2 \
         xz-utils \
-        libprotobuf-c1 \
-        libnet1 \
-        libnl-3-200 \
+        zip \
     && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install yamllint==1.16.0