diff --git a/docker/develop/plucky-slim/Dockerfile b/docker/develop/plucky-slim/Dockerfile
index 40c107428..3ca7631fa 100644
--- a/docker/develop/plucky-slim/Dockerfile
+++ b/docker/develop/plucky-slim/Dockerfile
@@ -77,6 +77,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
     /scripts/install-s6.sh && \
     ln -sf /scripts/services/photoprism /etc/s6-overlay/s6-rc.d/photoprism && \
     touch /etc/s6-overlay/s6-rc.d/user/contents.d/photoprism && \
+    apt modernize-sources && \
     /scripts/cleanup.sh
 
 # Set default working directory.
diff --git a/docker/develop/plucky/Dockerfile b/docker/develop/plucky/Dockerfile
index cf5b99c54..b71391c8f 100644
--- a/docker/develop/plucky/Dockerfile
+++ b/docker/develop/plucky/Dockerfile
@@ -99,6 +99,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
         /photoprism/storage/config \
         /photoprism/storage/cache && \
     /scripts/install-s6.sh && \
+    apt modernize-sources && \
     /scripts/cleanup.sh
 
 # Download machine learning models and test data.
diff --git a/scripts/dist/Makefile b/scripts/dist/Makefile
index 195f79afa..b7af82973 100755
--- a/scripts/dist/Makefile
+++ b/scripts/dist/Makefile
@@ -43,8 +43,12 @@ intel: update install-intel
 install-intel-graphics: intel
 intel-graphics: intel
 install-intel:
-	@echo "Installing Intel Drivers..."
-	apt-get -qq install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders mesa-va-drivers libmfx-dev libmfx-gen-dev va-driver-all vainfo libva-dev
+	@echo "Installing Intel GPU Drivers..."
+	apt-get -qq install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders mesa-va-drivers libmfx-gen1.2 va-driver-all vainfo libva2
+amd: update install-amd
+install-amd:
+	@echo "Installing AMD VA-API GPU Drivers..."
+	apt-get -qq install mesa-va-drivers vainfo libva2
 clitools: update install-clitools
 cli-tools: clitools
 nano: clitools
diff --git a/scripts/dist/install-gpu.sh b/scripts/dist/install-gpu.sh
index c3e044c1d..bf84b1954 100755
--- a/scripts/dist/install-gpu.sh
+++ b/scripts/dist/install-gpu.sh
@@ -50,8 +50,8 @@ esac
 for t in ${GPU_DETECTED[@]}; do
   case $t in
     i915 | i965 | intel | opencl | icd)
-      echo "Installing Intel Drivers..."
-      apt-get -qq install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders mesa-va-drivers libmfx-dev libmfx-gen-dev va-driver-all vainfo libva-dev
+      echo "Installing Intel GPU Drivers..."
+      apt-get -qq install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders mesa-va-drivers libmfx-gen1.2 va-driver-all vainfo libva2
       ;;
 
     nvidia)
@@ -59,8 +59,8 @@ for t in ${GPU_DETECTED[@]}; do
       ;;
       
     amdgpu)
-      echo "Installing AMD VA-API Drivers..."
-      apt-get -qq install mesa-va-drivers vainfo libva-dev
+      echo "Installing AMD VA-API GPU Drivers..."
+      apt-get -qq install mesa-va-drivers vainfo libva2
       ;;