diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89242204..b937cf26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+* Add go1.21.7
+* Add go1.20.14
+* go1.21 defaults to go1.21.7
+* go1.20 defaults to go1.20.14
 
 ## [v186] - 2024-02-08
 
diff --git a/data.json b/data.json
index f699fbc3..4818f88f 100644
--- a/data.json
+++ b/data.json
@@ -3,9 +3,9 @@
     "DefaultVersion": "go1.12.17",
     "VersionExpansion": {
       "go1.22": "go1.22.0",
-      "go1.21": "go1.21.6",
+      "go1.21": "go1.21.7",
       "go1.20.0": "go1.20",
-      "go1.20": "go1.20.13",
+      "go1.20": "go1.20.14",
       "go1.19.0": "go1.19",
       "go1.19": "go1.19.13",
       "go1.18.0": "go1.18",
@@ -132,8 +132,8 @@
       "go1.17.13.linux-amd64.tar.gz",
       "go1.18.10.linux-amd64.tar.gz",
       "go1.19.13.linux-amd64.tar.gz",
-      "go1.20.13.linux-amd64.tar.gz",
-      "go1.21.6.linux-amd64.tar.gz",
+      "go1.20.14.linux-amd64.tar.gz",
+      "go1.21.7.linux-amd64.tar.gz",
       "go1.22.0.linux-amd64.tar.gz",
       "go1.4.3.linux-amd64.tar.gz",
       "go1.6.4.linux-amd64.tar.gz",
diff --git a/files.json b/files.json
index e2622d8c..f43dd9f9 100644
--- a/files.json
+++ b/files.json
@@ -767,6 +767,10 @@
     "SHA": "9a9d3dcae2b6a638b1f2e9bd4db08ffb39c10e55d9696914002742d90f0047b5",
     "URL": "https://dl.google.com/go/go1.20.13.linux-amd64.tar.gz"
   },
+  "go1.20.14.linux-amd64.tar.gz": {
+    "SHA": "ff445e48af27f93f66bd949ae060d97991c83e11289009d311f25426258f9c44",
+    "URL": "https://dl.google.com/go/go1.20.14.linux-amd64.tar.gz"
+  },
   "go1.20.2.linux-amd64.tar.gz": {
     "SHA": "4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768",
     "URL": "https://go.dev/dl/go1.20.2.linux-amd64.tar.gz"
@@ -831,6 +835,10 @@
     "SHA": "3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4",
     "URL": "https://dl.google.com/go/go1.21.6.linux-amd64.tar.gz"
   },
+  "go1.21.7.linux-amd64.tar.gz": {
+    "SHA": "13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c",
+    "URL": "https://dl.google.com/go/go1.21.7.linux-amd64.tar.gz"
+  },
   "go1.22.0.linux-amd64.tar.gz": {
     "SHA": "f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265",
     "URL": "https://dl.google.com/go/go1.22.0.linux-amd64.tar.gz"