diff --git a/.github/workflows/integration-test-image.yml b/.github/workflows/integration-test-image.yml
index e7f7a472f5..74443c2122 100644
--- a/.github/workflows/integration-test-image.yml
+++ b/.github/workflows/integration-test-image.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           context: .
           file: Dockerfile.it
-          push: true
+          push: ${{ github.branch.name == 'main'}}
           tags: ghcr.io/markphelps/flipt-integration-test:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index f90c092fef..9157b006f1 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - uses: arduino/setup-task@v1
 
diff --git a/.tool-versions b/.tool-versions
index adfa00c135..e6f13478c0 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 golang 1.17.6
-nodejs 16.13.2
+nodejs 18.4.0
 ruby 2.6.3
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 7694a31778..52a851a233 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -9,7 +9,7 @@ Before starting, make sure you have the following installed:
 - GCC Compiler
 - [SQLite](https://sqlite.org/index.html)
 - [Go 1.17+](https://golang.org/doc/install)
-- [NodeJS >= 16](https://nodejs.org/en/)
+- [NodeJS >= 18](https://nodejs.org/en/)
 - [Yarn](https://yarnpkg.com/en/)
 - [Task](https://taskfile.dev/#/)
 
diff --git a/Dockerfile b/Dockerfile
index fa212fe80c..8b612bd166 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
 RUN curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN curl -sSL https://deb.nodesource.com/setup_16.x | bash && \
+RUN curl -sSL https://deb.nodesource.com/setup_18.x | bash && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/Dockerfile.it b/Dockerfile.it
index bc25610931..daa9825085 100644
--- a/Dockerfile.it
+++ b/Dockerfile.it
@@ -11,7 +11,7 @@ RUN echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
     apt-get install -y \
     sudo tzdata bats curl wget jq gnupg
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash
 
 RUN apt-get update && \
     apt-get install -y nodejs
diff --git a/Taskfile.yml b/Taskfile.yml
index 7ff463a145..3212e2441b 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -22,7 +22,7 @@ tasks:
     deps: [assets:deps]
     cmds:
       - cd ui && yarn build
-    vars:
+    env:
       NODE_OPTIONS: --openssl-legacy-provider
     sources:
       - ./ui/static/*
@@ -36,6 +36,8 @@ tasks:
     desc: Install UI dependencies
     cmds:
       - cd ui && yarn --frozen-lockfile
+    env:
+      NODE_OPTIONS: --openssl-legacy-provider
 
   bench:
     desc: Run benchmarks
diff --git a/ui/.tool-versions b/ui/.tool-versions
new file mode 100644
index 0000000000..4d21f34b28
--- /dev/null
+++ b/ui/.tool-versions
@@ -0,0 +1 @@
+nodejs 18.4.0
diff --git a/ui/README.md b/ui/README.md
index 7c9ea58802..38a6f4eb98 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -6,5 +6,5 @@ The ui directory contains these `.vue` files, along with others used in the web
 
 ## Build Requirements
 
-- [NodeJS >= 16](https://nodejs.org/en/)
+- [NodeJS >= 18](https://nodejs.org/en/)
 - [Yarn](https://yarnpkg.com/en/)