diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full
index bafe4757fa..40ec6ee374 100644
--- a/install/docker/Dockerfile.full
+++ b/install/docker/Dockerfile.full
@@ -88,6 +88,10 @@ RUN echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" |
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 RUN apt-get -y update && apt-get -y install libedgetpu1-std
 
+# set default shell to bash
+RUN chsh -s /bin/bash
+ENV SHELL="/bin/bash"
+
 ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"
diff --git a/install/docker/install-amd-graphics.sh b/install/docker/install-amd-graphics.sh
index 06944b0724..b2073b3ba7 100644
--- a/install/docker/install-amd-graphics.sh
+++ b/install/docker/install-amd-graphics.sh
@@ -23,7 +23,13 @@ fi
 
 # https://amdgpu-install.readthedocs.io/en/latest/install-prereq.html#installing-the-installer-package
 
-FILENAME="amdgpu-install_6.3.60300-1_all.deb"
+FILENAME=$(curl -s -L https://repo.radeon.com/amdgpu-install/latest/ubuntu/$distro/ | grep -o 'amdgpu-install_[^ ]*' | cut -d'"' -f1)
+if [ -z "$FILENAME" ]
+then
+    echo "AMD graphics package can not be installed. Could not find the package name."
+    exit 1
+fi
+
 set -e
 mkdir -p /tmp/amd
 cd /tmp/amd
diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer
index 8d79134550..1acb9467ca 100644
--- a/install/docker/template/Dockerfile.full.footer
+++ b/install/docker/template/Dockerfile.full.footer
@@ -32,6 +32,10 @@ RUN echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" |
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 RUN apt-get -y update && apt-get -y install libedgetpu1-std
 
+# set default shell to bash
+RUN chsh -s /bin/bash
+ENV SHELL="/bin/bash"
+
 ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"