diff --git a/docker-compose.yml b/docker-compose.yml
index c452f9e..3a982e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,116 +5,224 @@ services:
     build:
       context: .
       args:
-        RUBY_BASE: ruby:2.6
-        NODE_MAJOR: 11
-        YARN_VERSION: 1.13.0
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 16
+        YARN_VERSION: 1.22.17
     image: nextdude/ruby-node-yarn:latest
 
-  rny-2_6-11-1_13_0:
+  rny-2_7-16-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 16
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-16-1_22_17
+
+  rny-2_7-14-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 14
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-14-1_22_17
+
+  rny-2_7-11-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 11
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-11-1_22_17
+
+  rny-2_7-10-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 10
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-10-1_22_17
+
+  rny-2_7-8-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 8
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-8-1_22_17
+
+  rny-2_7-6-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.7
+        NODE_MAJOR: 6
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_7-6-1_22_17
+
+  rny-2_6-16-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.6
+        NODE_MAJOR: 16
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-16-1_22_17
+
+  rny-2_6-14-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.6
+        NODE_MAJOR: 14
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-14-1_22_17
+
+  rny-2_6-11-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.6
         NODE_MAJOR: 11
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_6-11-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-11-1_22_17
 
-  rny-2_6-10-1_13_0:
+  rny-2_6-10-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.6
         NODE_MAJOR: 10
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_6-10-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-10-1_22_17
 
-  rny-2_6-8-1_13_0:
+  rny-2_6-8-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.6
         NODE_MAJOR: 8
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_6-8-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-8-1_22_17
 
-  rny-2_6-6-1_13_0:
+  rny-2_6-6-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.6
         NODE_MAJOR: 6
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_6-6-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_6-6-1_22_17
+
+  rny-2_5-16-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.5
+        NODE_MAJOR: 16
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-16-1_22_17
 
-  rny-2_5-11-1_13_0:
+  rny-2_5-14-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.5
+        NODE_MAJOR: 14
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-14-1_22_17
+
+  rny-2_5-11-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.5
         NODE_MAJOR: 11
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_5-11-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-11-1_22_17
 
-  rny-2_5-10-1_13_0:
+  rny-2_5-10-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.5
         NODE_MAJOR: 10
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_5-10-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-10-1_22_17
 
-  rny-2_5-8-1_13_0:
+  rny-2_5-8-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.5
         NODE_MAJOR: 8
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_5-8-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-8-1_22_17
 
-  rny-2_5-6-1_13_0:
+  rny-2_5-6-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.5
         NODE_MAJOR: 6
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_5-6-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_5-6-1_22_17
+
+  rny-2_4-16-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.4
+        NODE_MAJOR: 16
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-16-1_22_17
+
+  rny-2_4-14-1_22_17:
+    build:
+      context: .
+      args:
+        RUBY_BASE: ruby:2.4
+        NODE_MAJOR: 14
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-14-1_22_17
 
-  rny-2_4-11-1_13_0:
+  rny-2_4-11-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.4
         NODE_MAJOR: 11
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_4-11-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-11-1_22_17
 
-  rny-2_4-10-1_13_0:
+  rny-2_4-10-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.4
         NODE_MAJOR: 10
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_4-10-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-10-1_22_17
 
-  rny-2_4-8-1_13_0:
+  rny-2_4-8-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.4
         NODE_MAJOR: 8
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_4-8-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-8-1_22_17
 
-  rny-2_4-6-1_13_0:
+  rny-2_4-6-1_22_17:
     build:
       context: .
       args:
         RUBY_BASE: ruby:2.4
         NODE_MAJOR: 6
-        YARN_VERSION: 1.13.0
-    image: nextdude/ruby-node-yarn:2_4-6-1_13_0
+        YARN_VERSION: 1.22.17
+    image: nextdude/ruby-node-yarn:2_4-6-1_22_17
 
diff --git a/gen-docker-compose.sh b/gen-docker-compose.sh
index 580a674..04a7a1f 100755
--- a/gen-docker-compose.sh
+++ b/gen-docker-compose.sh
@@ -1,24 +1,24 @@
 #!/usr/bin/env bash
 
-RUBY_VERSIONS="2.6 2.5 2.4"
-NODE_VERSIONS="11 10 8 6"
+RUBY_VERSIONS="2.7 2.6 2.5 2.4"
+NODE_VERSIONS="16 14 11 10 8 6"
 YARN_VERSIONS=$(curl -sSL --compressed https://yarnpkg.com/latest-version)
 
 # node release keys pulled from https://github.com/nodejs/node#release-team
 NODE_KEYS=(
-  0x4ED778F539E3634C779C87C6D7062848A1AB005C 
-  0x71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 
-  0x77984A986EBC2AA786BC0F66B01FBB92821C587A
-  0x8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
+  0x4ED778F539E3634C779C87C6D7062848A1AB005C
   0x94AE36675C464D64BAFA68DD7434390BDBE9B9C5
-  0xA48C2BEE680E841632CD4E44F07496B3EB3C1762
-  0xB9AE9905FFD7803F25714661B63B535A4C206CA9
-  0xB9E2F5981AA6E0CD28160D9FF13993A75599653C
+  0x74F12602B6F1C4E913FAA37AD3A89613643B6201
+  0x71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
+  0x8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
   0xC4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
+  0xC82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C
   0xDD8F2338BAE7501E3DD5AC78C273792F7D83545D
-  0xFD3A5288F042B6850C66B31F09FE44734EB7990E
+  0xA48C2BEE680E841632CD4E44F07496B3EB3C1762
+  0x108F52B48DB57BB0CC439B2997B01419BD92F80A
+  0xB9E2F5981AA6E0CD28160D9FF13993A75599653C
 )
-KEY_SERVER=hkp://na.pool.sks-keyservers.net:80
+KEY_SERVER=hkp://keys.openpgp.org:80
 
 gen_keys() {
   for key in ${NODE_KEYS[@]}