diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33
index 4e2c04de..c0143e8c 100644
--- a/scripts/Dockerfile-fedora_33
+++ b/scripts/Dockerfile-fedora_33
@@ -3,7 +3,18 @@ FROM fedora:33 AS sunshine-fedora_33
 RUN dnf -y update && \
     dnf -y group install "Development Tools" && \
     dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
-    dnf -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXfixes-devel libXtst-devel openssl-devel opus-devel pulseaudio-libs-devel \
+    boost-devel \
+    boost-static.x86_64 \
+    cmake \
+    ffmpeg-devel \
+    libevdev-devel \
+    libxcb-devel \
+    libX11-devel \
+    libXfixes-devel \
+    libXtst-devel \
+    openssl-devel \
+    opus-devel \
+    pulseaudio-libs-devel \
     && dnf clean all \
     && rm -rf /var/cache/yum
 
diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35
index 58b3f32e..2beca2f8 100644
--- a/scripts/Dockerfile-fedora_35
+++ b/scripts/Dockerfile-fedora_35
@@ -2,8 +2,24 @@ FROM fedora:35 AS sunshine-fedora_35
 
 RUN dnf -y update && \
     dnf -y group install "Development Tools" && \
-    dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
-    dnf -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXcursor-devel libXfixes-devel libXinerama-devel libXi-devel libXrandr-devel libXtst-devel mesa-libGL-devel openssl-devel opus-devel pulseaudio-libs-devel \
+    dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
+    boost-devel \
+    boost-static.x86_64 \
+    cmake \
+    ffmpeg-devel \
+    libevdev-devel \
+    libxcb-devel \
+    libX11-devel \
+    libXcursor-devel \
+    libXfixes-devel \
+    libXinerama-devel \
+    libXi-devel \
+    libXrandr-devel \
+    libXtst-devel \
+    mesa-libGL-devel \
+    openssl-devel \
+    opus-devel \
+    pulseaudio-libs-devel \
     && dnf clean all \
     && rm -rf /var/cache/yum
 
diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04
index 0ef8a085..2c732eb5 100644
--- a/scripts/Dockerfile-ubuntu_18_04
+++ b/scripts/Dockerfile-ubuntu_18_04
@@ -8,30 +8,30 @@ RUN apt-get update -y && \
     add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt-get update -y && \
     apt-get install -y --no-install-recommends \
-                        build-essential \
-                        cmake \
-                        gcc-10 \
-                        git \
-                        g++-10 \
-                        libavdevice-dev \
-                        libboost-thread-dev \
-                        libboost-filesystem-dev \
-                        libboost-log-dev \
-                        libcap-dev \
-                        libdrm-dev \
-                        libevdev-dev \
-                        libpulse-dev \
-                        libopus-dev \
-                        libssl-dev \
-                        libwayland-dev \
-                        libx11-dev \
-                        libxcb-shm0-dev \
-                        libxcb-xfixes0-dev \
-                        libxcb1-dev \
-                        libxfixes-dev \
-                        libxrandr-dev \
-                        libxtst-dev \
-                        wget \
+    build-essential \
+    cmake \
+    gcc-10 \
+    git \
+    g++-10 \
+    libavdevice-dev \
+    libboost-thread-dev \
+    libboost-filesystem-dev \
+    libboost-log-dev \
+    libcap-dev \
+    libdrm-dev \
+    libevdev-dev \
+    libpulse-dev \
+    libopus-dev \
+    libssl-dev \
+    libwayland-dev \
+    libx11-dev \
+    libxcb-shm0-dev \
+    libxcb-xfixes0-dev \
+    libxcb1-dev \
+    libxfixes-dev \
+    libxrandr-dev \
+    libxtst-dev \
+    wget \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04
index e6baea1a..713726a4 100644
--- a/scripts/Dockerfile-ubuntu_20_04
+++ b/scripts/Dockerfile-ubuntu_20_04
@@ -5,29 +5,29 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
-                        build-essential \
-                        cmake \
-                        git \
-                        g++-10 \
-                        libavdevice-dev \
-                        libboost-thread-dev \
-                        libboost-filesystem-dev \
-                        libboost-log-dev \
-                        libcap-dev \
-                        libdrm-dev \
-                        libevdev-dev \
-                        libpulse-dev \
-                        libopus-dev \
-                        libssl-dev \
-                        libwayland-dev \
-                        libx11-dev \
-                        libxcb-shm0-dev \
-                        libxcb-xfixes0-dev \
-                        libxcb1-dev \
-                        libxfixes-dev \
-                        libxrandr-dev \
-                        libxtst-dev \
-                        wget \
+    build-essential \
+    cmake \
+    git \
+    g++-10 \
+    libavdevice-dev \
+    libboost-thread-dev \
+    libboost-filesystem-dev \
+    libboost-log-dev \
+    libcap-dev \
+    libdrm-dev \
+    libevdev-dev \
+    libpulse-dev \
+    libopus-dev \
+    libssl-dev \
+    libwayland-dev \
+    libx11-dev \
+    libxcb-shm0-dev \
+    libxcb-xfixes0-dev \
+    libxcb1-dev \
+    libxfixes-dev \
+    libxrandr-dev \
+    libxtst-dev \
+    wget \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04
index a584d6e3..6c644d4e 100644
--- a/scripts/Dockerfile-ubuntu_21_04
+++ b/scripts/Dockerfile-ubuntu_21_04
@@ -5,29 +5,29 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
-                        build-essential \
-                        cmake \
-                        git \
-                        libavdevice-dev \
-                        libboost-thread-dev \
-                        libboost-filesystem-dev \
-                        libboost-log-dev \
-                        libcap-dev \
-                        libdrm-dev \
-                        libevdev-dev \
-                        libpulse-dev \
-                        libopus-dev \
-                        libssl-dev \
-                        libwayland-dev \
-                        libx11-dev \
-                        libxcb-shm0-dev \
-                        libxcb-xfixes0-dev \
-                        libxcb1-dev \
-                        libxfixes-dev \
-                        libxrandr-dev \
-                        libxtst-dev \
-                        nvidia-cuda-dev \
-                        nvidia-cuda-toolkit \
+    build-essential \
+    cmake \
+    git \
+    libavdevice-dev \
+    libboost-thread-dev \
+    libboost-filesystem-dev \
+    libboost-log-dev \
+    libcap-dev \
+    libdrm-dev \
+    libevdev-dev \
+    libpulse-dev \
+    libopus-dev \
+    libssl-dev \
+    libwayland-dev \
+    libx11-dev \
+    libxcb-shm0-dev \
+    libxcb-xfixes0-dev \
+    libxcb1-dev \
+    libxfixes-dev \
+    libxrandr-dev \
+    libxtst-dev \
+    nvidia-cuda-dev \
+    nvidia-cuda-toolkit \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10
index dc067231..faff3c1b 100644
--- a/scripts/Dockerfile-ubuntu_21_10
+++ b/scripts/Dockerfile-ubuntu_21_10
@@ -5,29 +5,29 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
-                        build-essential \
-                        cmake \
-                        git \
-                        libavdevice-dev \
-                        libboost-thread-dev \
-                        libboost-filesystem-dev \
-                        libboost-log-dev \
-                        libcap-dev \
-                        libdrm-dev \
-                        libevdev-dev \
-                        libpulse-dev \
-                        libopus-dev \
-                        libssl-dev \
-                        libwayland-dev \
-                        libx11-dev \
-                        libxcb-shm0-dev \
-                        libxcb-xfixes0-dev \
-                        libxcb1-dev \
-                        libxfixes-dev \
-                        libxrandr-dev \
-                        libxtst-dev \
-                        nvidia-cuda-dev \
-                        nvidia-cuda-toolkit \
+    build-essential \
+    cmake \
+    git \
+    libavdevice-dev \
+    libboost-thread-dev \
+    libboost-filesystem-dev \
+    libboost-log-dev \
+    libcap-dev \
+    libdrm-dev \
+    libevdev-dev \
+    libpulse-dev \
+    libopus-dev \
+    libssl-dev \
+    libwayland-dev \
+    libx11-dev \
+    libxcb-shm0-dev \
+    libxcb-xfixes0-dev \
+    libxcb1-dev \
+    libxfixes-dev \
+    libxrandr-dev \
+    libxtst-dev \
+    nvidia-cuda-dev \
+    nvidia-cuda-toolkit \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*