diff --git a/dockerfile-kasm-zoom b/dockerfile-kasm-zoom
index fdb7cdb..d210f78 100644
--- a/dockerfile-kasm-zoom
+++ b/dockerfile-kasm-zoom
@@ -10,21 +10,22 @@ WORKDIR $HOME
 
 ######### Customize Container Here ###########
 
-
+# Install Zoom
 COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/
 RUN bash $INST_SCRIPTS/zoom/install_zoom.sh  && rm -rf $INST_SCRIPTS/zoom/
-
 COPY ./src/ubuntu/install/zoom/custom_startup.sh $STARTUPDIR/custom_startup.sh
 RUN chmod +x $STARTUPDIR/custom_startup.sh
 RUN chmod 755 $STARTUPDIR/custom_startup.sh
 
+# Install Chrome
+COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
+RUN bash $INST_SCRIPTS/chrome/install_chrome.sh  && rm -rf $INST_SCRIPTS/chrome/
 
 # Update the desktop environment to be optimized for a single application
 RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/
 RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png
 RUN apt-get remove -y xfce4-panel
 
-
 ######### End Customizations ###########
 
 RUN chown 1000:0 $HOME
diff --git a/src/ubuntu/install/zoom/custom_startup.sh b/src/ubuntu/install/zoom/custom_startup.sh
index 06befae..402570b 100644
--- a/src/ubuntu/install/zoom/custom_startup.sh
+++ b/src/ubuntu/install/zoom/custom_startup.sh
@@ -5,7 +5,7 @@ PGREP="zoom"
 export MAXIMIZE="true"
 export MAXIMIZE_NAME="Zoom"
 MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
-DEFAULT_ARGS="--no-sandbox"
+DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
diff --git a/src/ubuntu/install/zoom/install_zoom.sh b/src/ubuntu/install/zoom/install_zoom.sh
index ae1ca1a..ce566ea 100644
--- a/src/ubuntu/install/zoom/install_zoom.sh
+++ b/src/ubuntu/install/zoom/install_zoom.sh
@@ -8,11 +8,29 @@ if [ "${ARCH}" == "arm64" ] ; then
     exit 0
 fi
 
-
+# Install Zoom
 wget -q  https://zoom.us/client/latest/zoom_${ARCH}.deb
 apt-get update
 apt-get install -y ./zoom_${ARCH}.deb
 rm zoom_amd64.deb
-sed -i 's#/usr/bin/zoom#/usr/bin/zoom --no-sandbox##' /usr/share/applications/Zoom.desktop
 cp /usr/share/applications/Zoom.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/Zoom.desktop
+
+# Add wrapper to detect seccomp
+rm -f /usr/bin/zoom
+cat > /usr/bin/zoom <<EOF
+#!/bin/bash
+if [[ \$(awk '/Seccomp:/ {print \$2}' /proc/1/status) == "0" ]]; then
+  /opt/zoom/ZoomLauncher "\$@"
+else
+  /opt/zoom/ZoomLauncher --no-sandbox "\$@"
+fi
+EOF
+chmod +x /usr/bin/zoom
+
+if [ -z ${SKIP_CLEAN+x} ]; then
+  apt-get autoclean
+  rm -rf \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
+fi