diff --git a/Base/Dockerfile b/Base/Dockerfile
index 79214cf9c..43826e265 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -60,6 +60,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
     supervisor \
     gnupg2 \
     libnss3-tools \
+    python3-pip \
     openjdk-${JRE_VERSION}-jre-headless \
   && if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
        export ARCH=armhf ; \
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
index b86c50633..7cf22070c 100644
--- a/NodeBase/Dockerfile
+++ b/NodeBase/Dockerfile
@@ -104,6 +104,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
   && apt-get -qyy autoremove \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get -qyy clean \
+  && pip install --no-cache-dir --upgrade --break-system-packages setuptools \
 ########################################
 # noVNC exposes VNC through a web page #
 ########################################
@@ -117,9 +118,16 @@ RUN --mount=type=secret,id=SEL_PASSWD \
       "https://github.com/novnc/websockify/archive/refs/${WEBSOCKIFY_SOURCE}/${WEBSOCKIFY_VERSION}.zip" \
   && unzip -x websockify.zip \
   && rm websockify.zip \
-  && mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify \
+  # Setup dependencies
+  && cd websockify-${WEBSOCKIFY_VERSION} \
+  && python3 setup.py install \
+  # Move websockify and run to the noVNC directory
+  && mv websockify /opt/bin/noVNC/utils/websockify \
+  && mv run /opt/bin/noVNC/utils/websockify \
   && chmod +x /opt/bin/noVNC/utils/websockify/run \
-  && rm -rf /opt/bin/noVNC/utils/websockify/docker /opt/bin/noVNC/utils/websockify/tests \
+  # Cleanup unnecessary files
+  && cd .. \
+  && rm -rf websockify-${WEBSOCKIFY_VERSION} \
 #========================================================================
 # Run this command for executable file permissions for /dev/shm when    #
 # this is a "child" container running in Docker Desktop and WSL2 distro #