diff --git a/charts/codefresh/files/updateSystemReImages.sh b/charts/codefresh/files/updateSystemReImages.sh
index 6edd11c04..038166270 100755
--- a/charts/codefresh/files/updateSystemReImages.sh
+++ b/charts/codefresh/files/updateSystemReImages.sh
@@ -35,6 +35,13 @@ function updateRESpec {
                     }
                 }
             )"
+        mongosh "$MONGO_URI_RE_MANAGER" --tls --tlsCertificateKeyFile /etc/ssl/mongodb/ca.pem --tlsAllowInvalidHostnames --tlsAllowInvalidCertificates --eval "db.getCollection('runtime-environment').updateOne(
+            {'metadata.name': '$1'},
+            { \$set: {
+                \"runtimeScheduler.command\": [\"node\", \"dist/server/index.js\"]
+                }
+            }
+        )"
     else
         mongosh "$MONGO_URI_RE_MANAGER" --eval "db.getCollection('runtime-environment').updateOne(
                 {'metadata.name': '$1'},
@@ -57,6 +64,13 @@ function updateRESpec {
                     }
                 }
             )"
+        mongosh "$MONGO_URI_RE_MANAGER" --eval "db.getCollection('runtime-environment').updateOne(
+            {'metadata.name': '$1'},
+            { \$set: {
+                \"runtimeScheduler.command\": [\"node\", \"dist/server/index.js\"]
+                }
+            }
+        )"
     fi
 }
 
@@ -65,4 +79,4 @@ disableMongoTelemetry
 for re in ${DEFAULT_RE_NAMES[@]}; do
     echo "Updating the runtime $re"
     updateRESpec $re
-done
\ No newline at end of file
+done
diff --git a/charts/codefresh/templates/configmaps/runtimeEnvironments.json.tpl b/charts/codefresh/templates/configmaps/runtimeEnvironments.json.tpl
index d52b9ad55..f63f92dc9 100644
--- a/charts/codefresh/templates/configmaps/runtimeEnvironments.json.tpl
+++ b/charts/codefresh/templates/configmaps/runtimeEnvironments.json.tpl
@@ -31,9 +31,8 @@
       },
       "image": "{{ include "codefresh.buildImageName" (dict "registry" .Values.global.imageRegistry "imageFullName" .Values.runtimeImages.ENGINE_IMAGE) }}",
       "command": [
-        "npm",
-        "run",
-        "start"
+        "node",
+        "dist/server/index.js"
       ],
       "envVars": {
         {{- if .Values.global.env }}
@@ -111,9 +110,8 @@
       "runtimeScheduler": {
           "image": "{{ include "codefresh.buildImageName" (dict "registry" .Values.global.imageRegistry "imageFullName" .Values.runtimeImages.ENGINE_IMAGE) }}",
           "command": [
-              "npm",
-              "run",
-              "start"
+            "node",
+            "dist/server/index.js"
           ],
           "envVars": {
               "CONTAINER_LOGGER_SHOW_PROGRESS": "true",