diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b7b8f25..9a41864b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node_version: [12.x]
+        node_version: [16.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
@@ -109,10 +109,10 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-yarn-12.x-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-yarn-16.x-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-12.x-${{ hashFiles('**/yarn.lock') }}
-            ${{ runner.os }}-yarn-12.x-
+            ${{ runner.os }}-yarn-16.x-${{ hashFiles('**/yarn.lock') }}
+            ${{ runner.os }}-yarn-16.x-
             ${{ runner.os }}-yarn-
 
       - name: setup go v${{ matrix.go_version }}
@@ -138,10 +138,10 @@ jobs:
       - name: git checkout
         uses: actions/checkout@v2
 
-      - name: setup nodejs v${{ matrix.node_version }}
+      - name: setup nodejs v16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: download cache
         uses: actions/cache@v1
@@ -192,7 +192,7 @@ jobs:
       - name: setup nodejs v${{ matrix.node_version }}
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: download cache
         uses: actions/cache@v1
diff --git a/Dockerfile b/Dockerfile
index e355f46b..8f4fbbab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Start with a NodeJS base image that also contains yarn.
-FROM node:12.17.0-alpine as nodejsbuilder
+FROM node:16.14.2-alpine as nodejsbuilder
 
 # Pass a tag, branch or a commit using build-arg. This allows a docker image to
 # be built from a specified Git state. The default image will use the Git tip of
@@ -20,8 +20,8 @@ ARG public_url=""
 #      be mitigated by switching to HTTP and increasing the network timeout.
 #      See https://github.com/yarnpkg/yarn/issues/5259 for more info.
 RUN apk add --no-cache --update alpine-sdk \
-    python \
-    git \
+  python \
+  git \
   && git clone https://github.com/lightninglabs/lightning-terminal /go/src/github.com/lightninglabs/lightning-terminal \
   && cd /go/src/github.com/lightninglabs/lightning-terminal \
   && git checkout $checkout \
@@ -51,7 +51,7 @@ ENV GO111MODULE on
 
 # Install dependencies and install/build lightning-terminal.
 RUN apk add --no-cache --update alpine-sdk \
-    make \
+  make \
   && cd /go/src/github.com/lightninglabs/lightning-terminal \
   && make go-install PUBLIC_URL=$public_url \
   && make go-install-cli
@@ -75,9 +75,9 @@ COPY --from=golangbuilder /go/bin/pool /bin/
 
 # Add bash.
 RUN apk add --no-cache \
-    bash \
-    jq \
-    ca-certificates
+  bash \
+  jq \
+  ca-certificates
 
 # Specify the start command and entrypoint as the lightning-terminal daemon.
 ENTRYPOINT ["litd"]
diff --git a/dev.Dockerfile b/dev.Dockerfile
index ce1eaa6e..d2c7ebe4 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,5 +1,5 @@
 # Start with a NodeJS base image that also contains yarn.
-FROM node:12.17.0-alpine as nodejsbuilder
+FROM node:16.14.2-alpine as nodejsbuilder
 
 # Copy in the local repository to build from.
 COPY . /go/src/github.com/lightninglabs/lightning-terminal
@@ -28,7 +28,7 @@ ENV GO111MODULE on
 
 # Install dependencies and install/build lightning-terminal.
 RUN apk add --no-cache --update alpine-sdk \
-    make \
+  make \
   && cd /go/src/github.com/lightninglabs/lightning-terminal \
   && make go-install \
   && make go-install-cli
@@ -52,9 +52,9 @@ COPY --from=golangbuilder /go/bin/pool /bin/
 
 # Add bash.
 RUN apk add --no-cache \
-    bash \
-    jq \
-    ca-certificates
+  bash \
+  jq \
+  ca-certificates
 
 # Specify the start command and entrypoint as the lightning-terminal daemon.
 ENTRYPOINT ["litd"]
diff --git a/proto/Dockerfile b/proto/Dockerfile
index 9ec83b31..ded2c392 100644
--- a/proto/Dockerfile
+++ b/proto/Dockerfile
@@ -1,5 +1,5 @@
 # Start with a NodeJS base image that also contains yarn.
-FROM node:12.17.0-buster as nodejsbuilder
+FROM node:16.14.2-buster as nodejsbuilder
 
 RUN apt-get update && apt-get install -y \
   git \