diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6d9705b4e2..4b6a60b7c3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -135,7 +135,7 @@ jobs:
         if: github.event.inputs.skip-build-push-image != 'true'
         uses: nick-invision/retry@master
         with:
-          timeout_minutes: 160
+          timeout_minutes: 180
           max_attempts: 3
           retry_wait_seconds: 60
           command: PLATFORMS="${PLATFORMS}" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 884f8a6ed5..80fd0dc125 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -24,11 +24,18 @@ jobs:
       - build-test
     if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && !failure() && !cancelled()
     name: Deploy and Release Nightly
-    runs-on: blacksmith-8vcpu-ubuntu-2204
+    runs-on: ubuntu-22.04
     permissions: write-all
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
+        with:
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
       - name: Checkout code
         uses: actions/checkout@main
         with:
@@ -78,7 +85,7 @@ jobs:
       - name: Build images
         uses: nick-invision/retry@master
         with:
-          timeout_minutes: 160
+          timeout_minutes: 180
           max_attempts: 3
           retry_wait_seconds: 60
           command: PLATFORMS="${PLATFORMS}" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
diff --git a/Base/Dockerfile b/Base/Dockerfile
index c5cf63c841..0e203e14c9 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -8,12 +8,12 @@ ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 ARG MVN_SELENIUM_VERSION
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
-ARG OPENTELEMETRY_VERSION=1.48.0
-ARG GRPC_VERSION=1.71.0
-ARG NETTY_VERSION=4.2.0.Final
-ARG CS_VERSION=2.1.18
+ARG OPENTELEMETRY_VERSION=1.51.0
+ARG GRPC_VERSION=1.73.0
+ARG NETTY_VERSION=4.1.122.Final
+ARG CS_VERSION=2.1.24
 ARG POSTGRESQL_VERSION=42.7.7
-ARG ENVSUBST_VERSION=1.4.4
+ARG ENVSUBST_VERSION=1.4.5
 
 #Arguments to define the user running Selenium
 ARG SEL_USER=seluser
@@ -46,10 +46,10 @@ ENV DEBIAN_FRONTEND=noninteractive \
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
-RUN echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" > /etc/apt/sources.list \
-    && echo "deb-src [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" >> /etc/apt/sources.list \
-    && echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list \
-    && echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list
+#RUN echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" > /etc/apt/sources.list \
+#    && echo "deb-src [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" >> /etc/apt/sources.list \
+#    && echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list \
+#    && echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list
 
 RUN apt-get -qqy update \
   && apt-get upgrade -yq \
diff --git a/NodeChrome/install-chrome.sh b/NodeChrome/install-chrome.sh
index 01dea4d20f..ec3cb31b52 100755
--- a/NodeChrome/install-chrome.sh
+++ b/NodeChrome/install-chrome.sh
@@ -18,7 +18,7 @@ echo "Installing Google Chrome: ${CHROME_VERSION}"
 
 # Add Google Chrome repository
 wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor | tee /etc/apt/trusted.gpg.d/google.gpg >/dev/null
-echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >>/etc/apt/sources.list.d/google-chrome.list
+echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google-chrome.list
 
 # Update package list
 apt-get update -qqy
@@ -38,7 +38,6 @@ else
 fi
 
 # Cleanup
-rm /etc/apt/sources.list.d/google-chrome.list
 rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 echo "Google Chrome installation completed"
diff --git a/NodeEdge/Dockerfile b/NodeEdge/Dockerfile
index 127626c8f0..8ad4f32b54 100644
--- a/NodeEdge/Dockerfile
+++ b/NodeEdge/Dockerfile
@@ -15,7 +15,7 @@ USER root
 #============================================
 ARG EDGE_VERSION="microsoft-edge-stable"
 RUN wget -q -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/microsoft.gpg >/dev/null \
-  && echo "deb https://packages.microsoft.com/repos/edge stable main" >> /etc/apt/sources.list.d/microsoft-edge.list \
+  && echo "deb https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge.list \
   && apt-get update -qqy \
   && if echo "${EDGE_VERSION}" | grep -qE "microsoft-edge-stable[_|=][0-9]*"; \
     then \
@@ -26,7 +26,6 @@ RUN wget -q -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearm
     else \
       apt-get -qqy --no-install-recommends install ${EDGE_VERSION} ; \
     fi \
-  && rm /etc/apt/sources.list.d/microsoft-edge.list \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=================================