diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5f15c1319..ed35ce474 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -47,9 +47,9 @@ jobs:
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           make set_nightly_env
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
-          echo "GH_ORG=${GH_ORG}" >> $GITHUB_ENV
+          echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
-          GH_ORG: ${{ vars.GH_ORG || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       - name: Build Docker images
         run: VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
       - name: Count image layers
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e11edf65c..1e015dac3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -27,7 +27,7 @@ jobs:
           echo "NAME=${NAMESPACE}" >> $GITHUB_ENV
         env:
           NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
-          GH_ORG: ${{ vars.GH_ORG || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       - name: Sets prerelease to false by default
         run: echo "PRERELEASE=false" >> $GITHUB_ENV
       - name: Build base image to get Grid version
diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
index 228aca921..cb106a795 100644
--- a/.github/workflows/helm-chart-test.yml
+++ b/.github/workflows/helm-chart-test.yml
@@ -101,9 +101,9 @@ jobs:
           echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
           make set_nightly_env
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
-          echo "GH_ORG=${GH_ORG}" >> $GITHUB_ENV
+          echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
-          GH_ORG: ${{ vars.GH_ORG || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       - name: Setup Kubernetes environment
         uses: nick-invision/retry@master
         with:
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 8f3fb9220..1f6f41cd4 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -23,10 +23,10 @@ jobs:
         run: |
           echo "PRERELEASE=true" >> $GITHUB_ENV
           echo "NAME=${NAMESPACE}" >> $GITHUB_ENV
-          echo "GH_ORG=${GH_ORG}" >> $GITHUB_ENV
+          echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
-          GH_ORG: ${{ vars.GH_ORG || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       - name: Build base image to get Grid version
         run: VERSION="local" BUILD_DATE=${BUILD_DATE} make base_nightly
       - name: Get Grid version
diff --git a/.github/workflows/test-video.yml b/.github/workflows/test-video.yml
index 536e846d0..202758120 100644
--- a/.github/workflows/test-video.yml
+++ b/.github/workflows/test-video.yml
@@ -63,9 +63,9 @@ jobs:
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           make set_nightly_env
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
-          echo "GH_ORG=${GH_ORG}" >> $GITHUB_ENV
+          echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
-          GH_ORG: ${{ vars.GH_ORG || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       - name: Pre-build to reduce logs in test phase
         run: |
           VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make hub
diff --git a/Base/Dockerfile b/Base/Dockerfile
index 3ebd2be61..b3d9fee58 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -4,7 +4,7 @@ LABEL authors="Selenium <selenium-developers@googlegroups.com>"
 # Arguments to define the version of dependencies to download
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
-ARG GH_ORG=SeleniumHQ
+ARG AUTHORS=SeleniumHQ
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl)
 ARG OPENTELEMETRY_VERSION=1.36.0
 ARG GRPC_VERSION=1.62.2
@@ -15,27 +15,31 @@ ARG SEL_GROUP=${SEL_USER}
 ARG SEL_PASSWD=secret
 ARG UID=1200
 ARG GID=1201
-
-USER root
-#================================================
-# Customize sources for apt-get
-#================================================
-RUN  echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
-  && echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
-  && echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list
+ARG TZ="UTC"
+ARG JRE_VERSION=17
 ARG TARGETARCH=amd64
 ARG TARGETVARIANT
 
-# No interactive frontend during docker build
+USER root
+
 ENV DEBIAN_FRONTEND=noninteractive \
-    DEBCONF_NONINTERACTIVE_SEEN=true
+    # No interactive frontend during docker build
+    DEBCONF_NONINTERACTIVE_SEEN=true \
+    SEL_USER=${SEL_USER} \
+    SEL_UID=${UID} \
+    SEL_GID=${GID} \
+    HOME=/home/${SEL_USER} \
+    TZ=${TZ} \
+    SEL_DOWNLOAD_DIR=${HOME}/Downloads
 
 #========================
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
-ARG JRE_VERSION=17
-RUN apt-get -qqy update \
+RUN  echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
+  && echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
+  && echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list \
+  && apt-get -qqy update \
   && apt-get upgrade -yq \
   && apt-get -qqy --no-install-recommends install \
     acl \
@@ -56,40 +60,24 @@ RUN apt-get -qqy update \
   && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list >dev/null \
   && apt-get -qqy update \
   && apt-get -qqy --no-install-recommends install temurin-${JRE_VERSION}-jre -y \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#===================
-
-RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
+  && if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
        export ARCH=armhf ; \
     else \
-       export ARCH=$TARGETARCH ; \
+       export ARCH=${TARGETARCH} ; \
     fi \
-    && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/temurin-${JRE_VERSION}-jre-$ARCH/conf/security/java.security
-
-
+  && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/temurin-${JRE_VERSION}-jre-${ARCH}/conf/security/java.security \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
 #===================
 # Timezone settings
 # Possible alternative: https://github.com/docker/docker/issues/3359#issuecomment-32150214
 #===================
-ENV TZ "UTC"
-RUN ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
+  && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
     dpkg-reconfigure -f noninteractive tzdata && \
-    cat /etc/timezone
-
-#======================================
-# Configure environement
-#======================================
-ENV SEL_USER=${SEL_USER}
-ENV SEL_UID=${UID}
-ENV SEL_GID=${GID}
-ENV HOME=/home/${SEL_USER}
-ENV SEL_DOWNLOAD_DIR=${HOME}/Downloads
-
+    cat /etc/timezone \
 #========================================
-# Add normal user and group with passwordless sudo
+# Add normal user and group without password sudo
 #========================================
-RUN groupadd ${SEL_GROUP} \
+  && groupadd ${SEL_GROUP} \
          --gid ${SEL_GID} \
   && useradd ${SEL_USER} \
          --create-home \
@@ -98,75 +86,63 @@ RUN groupadd ${SEL_GROUP} \
          --uid ${SEL_UID} \
   && usermod -a -G sudo ${SEL_USER} \
   && echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers \
-  && echo "${SEL_USER}:${SEL_PASSWD}" | chpasswd
-
-#======================================
-# Add Grid check script
-#======================================
-COPY --chown="${SEL_UID}:${SEL_GID}" check-grid.sh entry_point.sh /opt/bin/
-
-#======================================
-# Add Supervisor configuration file
-#======================================
-COPY supervisord.conf /etc
-
+  && echo "${SEL_USER}:${SEL_PASSWD}" | chpasswd \
 #==========
 # Selenium & relaxing permissions for OpenShift and other non-sudo environments
 #==========
-RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor ${SEL_DOWNLOAD_DIR} \
+  && mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor ${SEL_DOWNLOAD_DIR} \
     ${HOME}/.mozilla ${HOME}/.vnc $HOME/.pki/nssdb \
+  # NSSDB initialization with an empty password
+  && certutil -d sql:$HOME/.pki/nssdb -N --empty-password \
   && touch /opt/selenium/config.toml \
   && chown -R ${SEL_USER}:${SEL_GROUP} /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \
   && chmod -R 775 /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \
-  && wget --no-verbose https://github.com/${GH_ORG}/selenium/releases/download/${RELEASE}/selenium-server-${VERSION}.jar \
+  && wget --no-verbose https://github.com/${AUTHORS}/selenium/releases/download/${RELEASE}/selenium-server-${VERSION}.jar \
     -O /opt/selenium/selenium-server.jar \
   && echo "${SEL_PASSWD}" > /opt/selenium/initialPasswd \
   && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
   && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
   && setfacl -Rm u:${SEL_USER}:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
-  && setfacl -Rm g:${SEL_GROUP}:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor
-
+  && setfacl -Rm g:${SEL_GROUP}:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
 #=====
-# Download observability related jaegar jars and make them available in a separate directory
+# Download observability related OpenTelemetry jars and make them available in a separate directory
 # so that the container can skip downloading them everytime it comes up
 #=====
-RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
+  && curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
   && chmod +x /tmp/cs \
   && mkdir -p /external_jars \
-  && chmod -R 775 /external_jars
-
-RUN /tmp/cs fetch --classpath --cache /external_jars \
+  && chmod -R 775 /external_jars \
+  && /tmp/cs fetch --classpath --cache /external_jars \
     io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
-    io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt
+    io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt \
+  && chmod 664 /external_jars/.classpath.txt \
+  && rm -fr /root/.cache/* \
+  # (Note that .bashrc is only executed in interactive bash shells.)
+  && echo 'if [[ $(ulimit -n) -gt 200000 ]]; then echo "WARNING: Very high value reported by \"ulimit -n\". Consider passing \"--ulimit nofile=32768\" to \"docker run\"."; fi' >> ${HOME}/.bashrc
 
-RUN chmod 664 /external_jars/.classpath.txt
-RUN rm -fr /root/.cache/*
+#======================================
+# Add Grid check script
+#======================================
+COPY --chown="${SEL_UID}:${SEL_GID}" check-grid.sh entry_point.sh /opt/bin/
+
+#======================================
+# Add Supervisor configuration file
+#======================================
+COPY supervisord.conf /etc
 
 #===================================================
 # Run the following commands as non-privileged user
 #===================================================
 USER ${SEL_UID}:${SEL_GID}
 
-#==========
-# NSSDB initialization with an empty password
-#==========
-RUN certutil -d sql:$HOME/.pki/nssdb -N --empty-password
-
-# Boolean value, maps "--bind-host"
-ENV SE_BIND_HOST false
-# Boolean value, maps "--reject-unsupported-caps"
-ENV SE_REJECT_UNSUPPORTED_CAPS false
-
-ENV SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED true
-ENV SE_OTEL_TRACES_EXPORTER "otlp"
-
-# A too high maximum number of file descriptors (with the default value
-# inherited from the docker host) can cause issues with some of our tools:
-#  - sanitizers hanging: https://github.com/google/sanitizers/issues/1662
-#  - valgrind crashing: https://stackoverflow.com/a/75293014
-# This is not be a problem on our CI hosts, but developers who run the image
-# on their machines may run into this (e.g., on Arch Linux), so warn them.
-# (Note that .bashrc is only executed in interactive bash shells.)
-RUN echo 'if [[ $(ulimit -n) -gt 200000 ]]; then echo "WARNING: Very high value reported by \"ulimit -n\". Consider passing \"--ulimit nofile=32768\" to \"docker run\"."; fi' >> ${HOME}/.bashrc
+#======================================
+# Configure environement
+#======================================
+    # Boolean value, maps "--bind-host"
+ENV SE_BIND_HOST=false \
+    # Boolean value, maps "--reject-unsupported-caps"
+    SE_REJECT_UNSUPPORTED_CAPS=false \
+    SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED=true \
+    SE_OTEL_TRACES_EXPORTER="otlp"
 
 CMD ["/opt/bin/entry_point.sh"]
diff --git a/Makefile b/Makefile
index 618742121..bfa1ff0a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
-GH_ORG := $(or $(GH_ORG),$(GH_ORG),SeleniumHQ)
 BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.19.0)
 BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.1)
 BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.19.0)
@@ -50,10 +49,10 @@ build: all
 ci: build test
 
 base:
-	cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg GH_ORG=$(GH_ORG) -t $(NAME)/base:$(TAG_VERSION) .
+	cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
 
 base_nightly:
-	cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION_NIGHTLY) --build-arg RELEASE=$(BASE_RELEASE_NIGHTLY) --build-arg GH_ORG=$(GH_ORG) -t $(NAME)/base:$(TAG_VERSION) .
+	cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION_NIGHTLY) --build-arg RELEASE=$(BASE_RELEASE_NIGHTLY) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
 
 hub: base
 	cd ./Hub && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/hub:$(TAG_VERSION) .
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
index 7daedebbf..4597f3066 100644
--- a/NodeBase/Dockerfile
+++ b/NodeBase/Dockerfile
@@ -12,80 +12,80 @@ ARG NOVNC_VERSION="master"
 ARG WEBSOCKIFY_SOURCE="heads"
 # Inputs: master, "v0.11.0"
 ARG WEBSOCKIFY_VERSION="master"
+ARG LANG_WHICH=en
+ARG LANG_WHERE=US
+ARG ENCODING=UTF-8
 
 USER root
 
+#==============================
+# Locale and encoding settings
+#==============================
+ENV LANG_WHICH=${LANG_WHICH} \
+    LANG_WHERE=${LANG_WHERE} \
+    ENCODING=${ENCODING} \
+    LANGUAGE=${LANG_WHICH}_${LANG_WHERE}.${ENCODING} \
+    LANG=${LANGUAGE} \
+#============================================
+# Shared cleanup script environment variables
+#============================================
+    SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=false \
+    SE_BROWSER_LEFTOVERS_INTERVAL_SECS=3600 \
+    SE_BROWSER_LEFTOVERS_PROCESSES_SECS=7200 \
+    SE_BROWSER_LEFTOVERS_TEMPFILES_DAYS=1 \
+#========================
+# Selenium Configuration
+#========================
+    # Drain the Node after N sessions (a value higher than zero enables the feature)
+    SE_DRAIN_AFTER_SESSION_COUNT=0 \
+    SE_NODE_MAX_SESSIONS=1 \
+    SE_NODE_SESSION_TIMEOUT=300 \
+    SE_NODE_OVERRIDE_MAX_SESSIONS=false \
+    SE_NODE_HEARTBEAT_PERIOD=30 \
+    SE_OTEL_SERVICE_NAME="selenium-node" \
+    # Setting Selenium Manager to work offline
+    SE_OFFLINE=true \
+#============================
+# Some configuration options
+#============================
+    SE_SCREEN_WIDTH=1360 \
+    SE_SCREEN_HEIGHT=1020 \
+    SE_SCREEN_DEPTH=24 \
+    SE_SCREEN_DPI=96 \
+    SE_START_XVFB=true \
+    SE_START_VNC=true \
+    SE_START_NO_VNC=true \
+    SE_NO_VNC_PORT=7900 \
+    SE_VNC_PORT=5900 \
+    DISPLAY=:99.0 \
+    DISPLAY_NUM=99 \
+    # Path to the Configfile
+    CONFIG_FILE=/opt/selenium/config.toml \
+    GENERATE_CONFIG=true \
+    # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
+    DBUS_SESSION_BUS_ADDRESS=/dev/null
+
+RUN apt-get update -qqy \
+  && apt-get -qqy --no-install-recommends install \
 #==============
 # Xvfb
 #==============
-RUN apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install \
     xvfb \
     xauth \
     pulseaudio \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#==============================
-# Locale and encoding settings
-#==============================
-ENV LANG_WHICH en
-ENV LANG_WHERE US
-ENV ENCODING UTF-8
-ENV LANGUAGE ${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
-ENV LANG ${LANGUAGE}
-# Layer size: small: ~9 MB
-# Layer size: small: ~9 MB MB (with --no-install-recommends)
-RUN apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install \
-    language-pack-en \
-    tzdata \
-    locales \
-  && locale-gen ${LANGUAGE} \
-  && dpkg-reconfigure --frontend noninteractive locales \
-  && apt-get -qyy autoremove \
-  && rm -rf /var/lib/apt/lists/* \
-  && apt-get -qyy clean
-
 #=====
 # VNC
 #=====
-RUN apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install \
-  x11vnc x11-utils \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
+    x11vnc x11-utils \
 #=========
-# fluxbox
-# A fast, lightweight and responsive window manager
+# Fluxbox (a fast, lightweight and responsive window manager)
 #=========
-RUN apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install \
     fluxbox eterm hsetroot feh \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#================
-# Font libraries
-#================
-# libfontconfig            ~1 MB
-# libfreetype6             ~1 MB
-# xfonts-cyrillic          ~2 MB
-# xfonts-scalable          ~2 MB
-# fonts-liberation         ~3 MB
-# fonts-ipafont-gothic     ~13 MB
-# fonts-wqy-zenhei         ~17 MB
-# fonts-tlwg-loma-otf      ~300 KB
-# fonts-ubuntu             ~5 MB
-#   Ubuntu Font Family, sans-serif typeface hinted for clarity
-# Removed packages:
-# xfonts-100dpi            ~6 MB
-# xfonts-75dpi             ~6 MB
-# fonts-noto-color-emoji   ~10 MB
-# Regarding fonts-liberation see:
-#  https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
-# Layer size: small: 50.3 MB (with --no-install-recommends)
-# Layer size: small: 50.3 MB
-RUN apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install \
+#==============================
+# Locale and encoding settings
+#==============================
+    language-pack-en \
+    locales \
     libfontconfig \
     libfreetype6 \
     xfonts-cyrillic \
@@ -96,13 +96,15 @@ RUN apt-get -qqy update \
     fonts-tlwg-loma-otf \
     fonts-ubuntu \
     fonts-noto-color-emoji \
+  && locale-gen ${LANGUAGE} \
+  && dpkg-reconfigure --frontend noninteractive locales \
+  && apt-get -qyy autoremove \
   && rm -rf /var/lib/apt/lists/* \
-  && apt-get -qyy clean
-
+  && apt-get -qyy clean \
 ########################################
 # noVNC exposes VNC through a web page #
 ########################################
-RUN  wget -nv -O noVNC.zip \
+  && wget -nv -O noVNC.zip \
        "https://github.com/novnc/noVNC/archive/refs/${NOVNC_SOURCE}/${NOVNC_VERSION}.zip" \
   && unzip -x noVNC.zip \
   && mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
@@ -113,110 +115,40 @@ RUN  wget -nv -O noVNC.zip \
   && unzip -x websockify.zip \
   && rm websockify.zip \
   && mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify \
-  && rm -rf /opt/bin/noVNC/utils/websockify/docker /opt/bin/noVNC/utils/websockify/tests
-
-#=========================================================================================================================================
-# Run this command for executable file permissions for /dev/shm when this is a "child" container running in Docker Desktop and WSL2 distro
-#=========================================================================================================================================
-RUN chmod +x /dev/shm
-
+  && rm -rf /opt/bin/noVNC/utils/websockify/docker /opt/bin/noVNC/utils/websockify/tests \
+#========================================================================
+# Run this command for executable file permissions for /dev/shm when    #
+# this is a "child" container running in Docker Desktop and WSL2 distro #
+#========================================================================
+  && chmod +x /dev/shm \
 # Creating base directory for Xvfb
-RUN mkdir -p /tmp/.X11-unix
-
+  && mkdir -p /tmp/.X11-unix \
 #==============================
 # Generating the VNC password using initial password in Base image
 # Changing ownership to ${SEL_USER}, so the service can be started
 #==============================
-
-RUN mkdir -p ${HOME}/.vnc \
-    && x11vnc -storepasswd $(cat /opt/selenium/initialPasswd) ${HOME}/.vnc/passwd \
-    && chown -R "${SEL_USER}:${SEL_GROUP}" ${HOME}/.vnc
-
-#==========
-# Relaxing permissions for OpenShift and other non-sudo environments
-#==========
-RUN chmod -R 775 ${HOME} /tmp/.X11-unix \
+  && x11vnc -storepasswd $(cat /opt/selenium/initialPasswd) ${HOME}/.vnc/passwd \
+  && chown -R "${SEL_USER}:${SEL_GROUP}" ${HOME}/.vnc \
+  && chmod -R 775 ${HOME} /tmp/.X11-unix \
   && chgrp -R 0 ${HOME} /tmp/.X11-unix \
   && chmod -R g=u ${HOME} /tmp/.X11-unix
 
-#============================================
-# Shared cleanup script environment variables
-#============================================
-ENV SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP false
-ENV SE_BROWSER_LEFTOVERS_INTERVAL_SECS 3600
-ENV SE_BROWSER_LEFTOVERS_PROCESSES_SECS 7200
-ENV SE_BROWSER_LEFTOVERS_TEMPFILES_DAYS 1
-
-#===================================================
-# Run the following commands as non-privileged user
-#===================================================
-
-USER ${SEL_UID}
-
-#==============================
-# Scripts to run Selenium Node and XVFB
-#==============================
+# Copying configuration script generator
 COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-node.sh \
       start-xvfb.sh \
-      /opt/bin/
-
-#==============================
-# Supervisor configuration file
-#==============================
-COPY selenium.conf /etc/supervisor/conf.d/
-
-#==============================
-# Scripts to run fluxbox, x11vnc and noVNC
-#==============================
-COPY --chown="${SEL_UID}:${SEL_GID}" start-vnc.sh \
+      start-vnc.sh \
       start-novnc.sh \
-      /opt/bin/
+      generate_config /opt/bin/
 
-#==============================
 # Selenium Grid logo as wallpaper for Fluxbox
-#==============================
 COPY selenium_grid_logo.png /usr/share/images/fluxbox/ubuntu-light.png
 
-#============================
-# Some configuration options
-#============================
-ENV SE_SCREEN_WIDTH 1360
-ENV SE_SCREEN_HEIGHT 1020
-ENV SE_SCREEN_DEPTH 24
-ENV SE_SCREEN_DPI 96
-ENV SE_START_XVFB true
-ENV SE_START_VNC true
-ENV SE_START_NO_VNC true
-ENV SE_NO_VNC_PORT 7900
-ENV SE_VNC_PORT 5900
-ENV DISPLAY :99.0
-ENV DISPLAY_NUM 99
-# Path to the Configfile
-ENV CONFIG_FILE=/opt/selenium/config.toml
-ENV GENERATE_CONFIG true
-# Drain the Node after N sessions. 
-# A value higher than zero enables the feature
-ENV SE_DRAIN_AFTER_SESSION_COUNT 0
-# Setting Selenium Manager to work offline
-ENV SE_OFFLINE true
-
-#========================
-# Selenium Configuration
-#========================
-# As integer, maps to "max-concurrent-sessions"
-ENV SE_NODE_MAX_SESSIONS 1
-# As integer, maps to "session-timeout" in seconds
-ENV SE_NODE_SESSION_TIMEOUT 300
-# As boolean, maps to "override-max-sessions"
-ENV SE_NODE_OVERRIDE_MAX_SESSIONS false
-# As integer, maps to "--heartbeat-period" in seconds
-ENV SE_NODE_HEARTBEAT_PERIOD 30
-
-# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
-ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
-ENV SE_OTEL_SERVICE_NAME "selenium-node"
+# Supervisor configuration file
+COPY selenium.conf /etc/supervisor/conf.d/
 
-# Copying configuration script generator
-COPY --chown="${SEL_UID}:${SEL_GID}" generate_config /opt/bin/generate_config
+#====================================================
+# Run the following commands as non-privileged user #
+#====================================================
+USER ${SEL_UID}
 
 EXPOSE 5900