diff --git a/docker/nginx/builder/cyberchef/Dockerfile b/docker/nginx/builder/cyberchef/Dockerfile
index a461ec3b..c97293c6 100644
--- a/docker/nginx/builder/cyberchef/Dockerfile
+++ b/docker/nginx/builder/cyberchef/Dockerfile
@@ -1,7 +1,8 @@
-FROM node:17.9.0-alpine3.15 as builder
+#FROM node:17.9.0-alpine3.15 as builder
+FROM node:18-alpine3.15 as builder
 #
 # Prep and build Cyberchef
-ENV CY_VER=v9.48.0
+ENV CY_VER=v9.55.0
 RUN apk -U --no-cache add build-base git python3 && \
     chown -R node:node /srv && \
     npm install -g grunt-cli
diff --git a/docker/nginx/builder/esvue/Dockerfile b/docker/nginx/builder/esvue/Dockerfile
index 6c153ba6..ce94b244 100644
--- a/docker/nginx/builder/esvue/Dockerfile
+++ b/docker/nginx/builder/esvue/Dockerfile
@@ -10,7 +10,7 @@ RUN apk -U --no-cache add git && \
     cd /opt/app && \
     cp /opt/src/package.json . && \
     cp /opt/src/yarn.lock . && \
-    yarn install && \
+    yarn install --ignore-optional && \
     cp -R /opt/src/* . && \
 # We need to set this ENV so we can run Elasticvue in its own location rather than /
     VUE_APP_PUBLIC_PATH=/elasticvue/ yarn build && \
diff --git a/docker/nginx/dist/conf/tpotweb.conf b/docker/nginx/dist/conf/tpotweb.conf
index d41a720e..c142c01d 100644
--- a/docker/nginx/dist/conf/tpotweb.conf
+++ b/docker/nginx/dist/conf/tpotweb.conf
@@ -90,24 +90,26 @@ server {
     #############################
 
     location / {
+        index index.html;
         auth_basic           "closed site";
         auth_basic_user_file /etc/nginx/nginxpasswd;
-        try_files $uri $uri/ /index.html?$args;
+        try_files $uri $uri/ /index.html;
     }
 
-    location ^~ /cyberchef {
+    location /elasticvue {
         index index.html;
-        alias /var/lib/nginx/html/cyberchef;
-        try_files $uri $uri/ /index.html?$args;
+        alias /var/lib/nginx/html/esvue/;
+        try_files $uri $uri/ /elasticvue/index.html;
     }
 
-    location ^~ /elasticvue {
+    location /cyberchef {
         index index.html;
-        alias /var/lib/nginx/html/esvue;
-        try_files $uri $uri/ /index.html?$args;
+        alias /var/lib/nginx/html/cyberchef/;
+        try_files $uri $uri/ /cyberchef/index.html;
     }
 
 
+
     #################
     ### Proxied sites
     #################
diff --git a/docker/nginx/dist/html/cyberchef/cyberchef.tgz b/docker/nginx/dist/html/cyberchef/cyberchef.tgz
index f7311b0f..57f5bd08 100644
Binary files a/docker/nginx/dist/html/cyberchef/cyberchef.tgz and b/docker/nginx/dist/html/cyberchef/cyberchef.tgz differ
diff --git a/docker/nginx/dist/html/esvue/esvue.tgz b/docker/nginx/dist/html/esvue/esvue.tgz
index 8f655cd8..dfd419c5 100644
Binary files a/docker/nginx/dist/html/esvue/esvue.tgz and b/docker/nginx/dist/html/esvue/esvue.tgz differ