diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index b013ea5..3e5c47f 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -19,6 +19,10 @@ jobs:
           - path: 14
             tags: "14 fermium latest"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6
+          - path: 16
+            tags: "16 gallium"
+            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7,linux/arm/v6
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 87e1d3c..b17341d 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -9,5 +9,6 @@ jobs:
       - uses: actions/checkout@v2.3.4
       - name: Build the Docker image
         run: |
-          docker run -i $(docker build -q 12) /bin/sh -c "node --version && git --version"
-          docker run -i $(docker build -q 14) /bin/sh -c "node --version && git --version"
+          docker run -i $(docker build -q 12) /bin/sh -c "node --version && npm --version && git --version"
+          docker run -i $(docker build -q 14) /bin/sh -c "node --version && npm --version && git --version"
+          docker run -i $(docker build -q 16) /bin/sh -c "node --version && npm --version && git --version"
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
index d73584e..bc15157 100644
--- a/.github/workflows/hadolint.yml
+++ b/.github/workflows/hadolint.yml
@@ -8,4 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
       - run: brew install hadolint
-      - run: hadolint {12,14}/Dockerfile
+      - run: hadolint {12,14,16}/Dockerfile
diff --git a/16/Dockerfile b/16/Dockerfile
new file mode 100644
index 0000000..5513eb6
--- /dev/null
+++ b/16/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:16-alpine3.14
+LABEL maintainer "Tim Brust <github@timbrust.de>"
+
+ARG REFRESHED_AT
+ENV REFRESHED_AT $REFRESHED_AT
+
+RUN apk -U upgrade \
+  && apk add --no-cache \
+    git \
+    openssh
diff --git a/README.md b/README.md
index 37926cf..be6c2b1 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@
 [![buildx Status](https://github.com/timbru31/docker-node-alpine-git/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3Abuildx)
 [![Lint Dockerfiles](https://github.com/timbru31/docker-node-alpine-git/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3A%22Lint+Dockerfiles%22)
 
-A minimal Dockerfile based on Node.js 12 LTS (Erbium) or Node.js 14 LTS (Fermium) alpine with Git and ssh installed.
+A minimal Dockerfile based on Node.js 12 LTS (Erbium), Node.js 14 LTS (Fermium) or Node.js 16 (Gallium) alpine with Git and ssh installed.
 
 ## What's included
 
-- Node.js Node.js 12 LTS or Node.js 14 LTS
-- npm 6
+- Node.js Node.js 12 LTS, Node.js 14 LTS or Node.js 16
+- npm 6 (< Node.js 16) or npm 7 (Node.js 16)
 - yarn
 - Git
 - ssh
@@ -23,7 +23,7 @@ These Dockerfiles leverage the new `buildx` functionality and offer the followin
 - linux/arm/v7
 - linux/arm/v6
 - linux/ppc64le
-- linux/s390x
+- linux/s390x (not for Node.js 16 [upstream bug])
 
 ---