diff --git a/Base/Dockerfile b/Base/Dockerfile
index 8cbd0e9d1..a52327ac7 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -53,7 +53,6 @@ RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
     acl \
     bzip2 \
     xz-utils \
-    ca-certificates \
     tzdata \
     sudo \
     unzip \
@@ -64,6 +63,7 @@ RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
     gnupg2 \
     libnss3-tools \
     openjdk-${JRE_VERSION}-jdk-headless \
+    ca-certificates \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 RUN --mount=type=secret,id=SEL_PASSWD \
diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile
index 250fc5611..760562e1e 100644
--- a/NodeFirefox/Dockerfile
+++ b/NodeFirefox/Dockerfile
@@ -43,6 +43,8 @@ RUN apt-get update -qqy && \
         ln -fs $(which firefox$FIREFOX_VERSION) /usr/bin/firefox ; \
       fi ; \
     else \
+      FIREFOX_VERSION="nightly-latest" \
+      && FIREFOX_VERSION=$(echo "-$FIREFOX_VERSION" | sed 's/-latest//') \
       FIREFOX_DOWNLOAD_URL="${FIREFOX_DOWNLOAD_URL}" ; \
     fi ; \
   fi && \
diff --git a/NodeFirefox/install-firefox-package.sh b/NodeFirefox/install-firefox-package.sh
index d2e17541b..5f0bed092 100755
--- a/NodeFirefox/install-firefox-package.sh
+++ b/NodeFirefox/install-firefox-package.sh
@@ -29,6 +29,9 @@ if [[ "${FIREFOX_DOWNLOAD_URL}" == *".deb"* ]]; then
   echo "Installing Firefox from deb package..."
   sudo apt-get install -y --allow-downgrades -f /tmp/firefox.deb
   rm -f /tmp/firefox.deb
+  if [ $FIREFOX_VERSION = "-beta" ] || [ $FIREFOX_VERSION = "-nightly" ] || [ $FIREFOX_VERSION = "-devedition" ] || [ $FIREFOX_VERSION = "-esr" ]; then
+    sudo ln -fs $(which firefox${FIREFOX_VERSION}) /usr/bin/firefox ; \
+  fi
 elif [[ "${FIREFOX_DOWNLOAD_URL}" == *".tar.bz2"* ]]; then
   echo "Downloading Firefox from ${FIREFOX_DOWNLOAD_URL}"
   wget -q -O /tmp/firefox.tar.bz2 "${FIREFOX_DOWNLOAD_URL}"