diff --git a/Probe/Dockerfile.tpl b/Probe/Dockerfile.tpl
index 339cf8ad13..1dccf34c73 100644
--- a/Probe/Dockerfile.tpl
+++ b/Probe/Dockerfile.tpl
@@ -84,7 +84,7 @@ ENTRYPOINT ["/usr/bin/tini", "--"]
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
-CMD [ "npm", "run", "dev" ]
+CMD [ "bash", "/usr/src/app/Start.dev.sh" ]
 {{ else }}
 # Copy app source
 COPY ./Probe /usr/src/app
@@ -95,4 +95,3 @@ RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
-
diff --git a/Probe/Start.dev.sh b/Probe/Start.dev.sh
new file mode 100644
index 0000000000..2e52759a4b
--- /dev/null
+++ b/Probe/Start.dev.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+COMMON_DIR="/usr/src/Common"
+ISOLATED_VM_DIR="${COMMON_DIR}/node_modules/isolated-vm"
+
+log() {
+    echo "[probe bootstrap] $*"
+}
+
+isolated_vm_can_load() {
+    node -e 'require(process.argv[1])' "${ISOLATED_VM_DIR}" >/dev/null 2>&1
+}
+
+ensure_common_dependencies() {
+    if [ ! -d "${COMMON_DIR}/node_modules" ]; then
+        log "Common node_modules is missing. Installing dependencies."
+        (
+            cd "${COMMON_DIR}"
+            npm install
+        )
+        return
+    fi
+
+    if [ ! -d "${ISOLATED_VM_DIR}" ]; then
+        log "isolated-vm is missing from Common node_modules. Reinstalling Common dependencies."
+        (
+            cd "${COMMON_DIR}"
+            npm install
+        )
+        return
+    fi
+
+    if isolated_vm_can_load; then
+        return
+    fi
+
+    log "Repairing isolated-vm for the current container runtime."
+
+    if ! (
+        cd "${COMMON_DIR}"
+        npm rebuild isolated-vm
+    ); then
+        log "isolated-vm rebuild failed. Reinstalling Common dependencies."
+        rm -rf "${ISOLATED_VM_DIR}"
+
+        (
+            cd "${COMMON_DIR}"
+            npm install
+        )
+    fi
+
+    isolated_vm_can_load
+}
+
+ensure_common_dependencies
+
+exec npm run dev