diff --git a/README.md b/README.md
index 1e49b052..db86a98b 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@
 [中文](./README_zh_CN.md)
 
 <!-- start autogeneration tags -->
-* `2.0.21`, `latest`
-* `2`, `2.0`, `2.0.20`, `stable`, `stable-2.0.20`
+* `2`, `2.0`, `2.0.21`, `latest`, `stable`, `stable-2.0.21`
+* `2.0`, `2.0.20`, `stable-2.0.20`
 * `2.0.19`
 * `2.0.18`
 * `2.0.17`
diff --git a/buildinfo.json b/buildinfo.json
index 8f5cfe06..00b3b1ea 100644
--- a/buildinfo.json
+++ b/buildinfo.json
@@ -109,16 +109,18 @@
     "sha256": "c4a901f2f1dbedbb41654560db4c6fab683a30c20334e805d4ef740c0416515a",
     "tags": [
       "stable-2.0.20",
-      "2",
       "2.0",
-      "2.0.20",
-      "stable"
+      "2.0.20"
     ]
   },
   "2.0.21": {
     "sha256": "1d6d2785006d6a8d9d5fdcdaa7097a189ec35ba95f3521025dc4e046f7a1398e",
     "tags": [
       "latest",
+      "stable",
+      "stable-2.0.21",
+      "2",
+      "2.0",
       "2.0.21"
     ]
   }
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b706588f..267c9e9f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,8 +6,8 @@ services:
       args:
         # Check buildinfo.json for supported versions and SHAs
         # https://github.com/factoriotools/factorio-docker/blob/master/buildinfo.json
-        - VERSION=2.0.20
-        - SHA256=c4a901f2f1dbedbb41654560db4c6fab683a30c20334e805d4ef740c0416515a
+        - VERSION=2.0.21
+        - SHA256=1d6d2785006d6a8d9d5fdcdaa7097a189ec35ba95f3521025dc4e046f7a1398e
     ports:
       - "34197:34197/udp"
       - "27015:27015/tcp"