diff --git a/apps/diskover/Dockerfile b/apps/diskover/Dockerfile
index 48f1a348c..fef1180bb 100644
--- a/apps/diskover/Dockerfile
+++ b/apps/diskover/Dockerfile
@@ -22,14 +22,20 @@ RUN \
   echo "**** install runtime packages ****" && \
   apt-get install -y --no-install-recommends \
     ncurses-bin \
-    php8.3-cli \
+    php-cli \
     php-sqlite3 \
     php-fpm \
     python3-pip \
     python3 \
     python3-venv && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  if [ -f /etc/php83/php-fpm.d/www.conf ]; then sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf; fi && \
+  for f in /etc/php/*/fpm/pool.d/www.conf; do \
+    [ -f "$f" ] || continue; \
+    sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' "$f"; \
+    grep -qxF 'clear_env = no' "$f" || echo 'clear_env = no' >> "$f"; \
+    fpmconf="$(dirname "$(dirname "$f")")/php-fpm.conf"; \
+    [ -f "$fpmconf" ] && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> "$fpmconf"; \
+  done && \
   echo "**** install diskover ****" && \
   if [ -z ${DISKOVER_RELEASE+x} ]; then \
     DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \
diff --git a/apps/diskover/start.sh b/apps/diskover/start.sh
index 1be664573..1acb3925b 100755
--- a/apps/diskover/start.sh
+++ b/apps/diskover/start.sh
@@ -38,4 +38,4 @@ if [ -f "/config/diskover.cfg" ]; then
     done
 fi
 
-exec php8.3 -S 0.0.0.0:80 -t /app/diskover-web/public
+exec php -S 0.0.0.0:80 -t /app/diskover-web/public
diff --git a/apps/kasm/Dockerfile b/apps/kasm/Dockerfile
index 01f3fba45..b0bfd787b 100644
--- a/apps/kasm/Dockerfile
+++ b/apps/kasm/Dockerfile
@@ -16,8 +16,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
 # Container setup
 RUN \
   echo "**** install packages ****" && \
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
-  echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu noble stable" > \
+  install -d -m 0755 /usr/share/keyrings && \
+  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+  echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu noble stable" > \
     /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
     && curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
@@ -72,29 +73,17 @@ RUN \
   echo "**** add installer ****" && \
   curl -o \
     /tmp/kasm.tar.gz -L \
-    "https://github.com/kasmtech/kasm-install-wizard/releases/download/${VERSION}/kasm_release.tar.gz" && \
+    "https://kasm-static-content.s3.amazonaws.com/kasm_release_${VERSION}.tar.gz" && \
   tar xf \
     /tmp/kasm.tar.gz -C \
     / && \
   ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
-  curl -o \
-    /tmp/images.tar.gz -L \
-    "https://kasm-ci.s3.amazonaws.com/${VERSION}-images-combined.tar.gz" && \
-  tar xf \
-    /tmp/images.tar.gz -C \
-    / && \
   sed -i \
     '/alembic_version/s/.*/alembic_version: '${ALVERSION}'/' \
     /kasm_release/conf/database/seed_data/default_images_a* && \
   sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
   echo "exit 0" > /kasm_release/install_dependencies.sh && \
-  /kasm_release/bin/utils/yq_$(uname -m) -i \
-    '.services.proxy.volumes += "/kasm_release/www/img/thumbnails:/srv/www/img/thumbnails"' \
-    /kasm_release/docker/docker-compose-all.yaml && \
   echo "**** copy assets ****" && \
-  cp \
-    /kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \
-    /wizard/public/img/thumbnails/ && \
   cp \
     /kasm_release/conf/database/seed_data/default_images_a* \
     /wizard/ && \