diff --git a/.github/workflows/conts.yml b/.github/workflows/conts.yml
index f376d1b..8376a3c 100644
--- a/.github/workflows/conts.yml
+++ b/.github/workflows/conts.yml
@@ -55,7 +55,7 @@ jobs:
     - name: Build
       uses: docker/build-push-action@v5
       with:
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm64
         provenance: false
         context: containers/${{ matrix.config.dir }}
         build-args: "${{ join(matrix.config.args, '\n') }}"
diff --git a/containers/matrix.json b/containers/matrix.json
index 831dc4b..bad753e 100644
--- a/containers/matrix.json
+++ b/containers/matrix.json
@@ -1,8 +1,15 @@
 [
     {
-        "name": "ubuntu-release",
+        "name": "ubuntu-22.04-release",
+        "aliases": [
+            "ubuntu",
+            "ubuntu-22.04",
+            "ubuntu-release",
+            "release"
+        ],
         "dir": "ubuntu",
         "args": [
+            "DISTRO=ubuntu",
             "RELEASE=22.04",
             "RVERSION=release"
         ],
@@ -15,9 +22,16 @@
         ]
     },
     {
-        "name": "ubuntu-devel",
+        "name": "ubuntu-22.04-devel",
+        "aliases": [
+            "ubuntu",
+            "ubuntu-22.04",
+            "ubuntu-devel",
+            "devel"
+        ],
         "dir": "ubuntu",
         "args": [
+            "DISTRO=ubuntu",
             "RELEASE=22.04",
             "RVERSION=devel"
         ],
@@ -27,5 +41,149 @@
             "ghcr.io/r-lib/rig/ubuntu-devel:latest",
             "ghcr.io/r-lib/rig/devel:latest"
         ]
+    },
+    {
+        "name": "ubuntu-20.04-release",
+        "aliases": [
+            "ubuntu",
+            "ubuntu-20.04",
+            "ubuntu-release",
+            "release"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=ubuntu",
+            "RELEASE=22.04",
+            "RVERSION=release"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/ubuntu-20.04-release:latest"
+        ]
+    },
+    {
+        "name": "ubuntu-20.04-devel",
+        "aliases": [
+            "ubuntu",
+            "ubuntu-20.04",
+            "ubuntu-devel",
+            "devel"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=ubuntu",
+            "RELEASE=20.04",
+            "RVERSION=devel"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/ubuntu-20.04-devel:latest"
+        ]
+    },
+    {
+        "name": "debian-10-release",
+        "aliases": [
+            "debian",
+            "debian-10",
+            "debian-release",
+            "release"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=10",
+            "RVERSION=release"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-10-release:latest"
+        ]
+    },
+    {
+        "name": "debian-10-devel",
+        "aliases": [
+            "debian",
+            "debian-10",
+            "debian-devel",
+            "ubuntu-devel"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=10",
+            "RVERSION=devel"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-10-devel:latest"
+        ]
+    },
+    {
+        "name": "debian-11-release",
+        "aliases": [
+            "debian",
+            "debian-11",
+            "debian-release",
+            "release"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=11",
+            "RVERSION=release"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-11-release:latest"
+        ]
+    },
+    {
+        "name": "debian-11-devel",
+        "aliases": [
+            "debian",
+            "debian-11",
+            "debian-devel",
+            "ubuntu-devel"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=11",
+            "RVERSION=devel"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-11-devel:latest"
+        ]
+    },
+    {
+        "name": "debian-12-release",
+        "aliases": [
+            "debian",
+            "debian-12",
+            "debian-release",
+            "release"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=12",
+            "RVERSION=release"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-12-release:latest"
+        ]
+    },
+    {
+        "name": "debian-12-devel",
+        "aliases": [
+            "debian",
+            "debian-12",
+            "debian-devel",
+            "ubuntu-devel"
+        ],
+        "dir": "ubuntu",
+        "args": [
+            "DISTRO=debian",
+            "RELEASE=12",
+            "RVERSION=devel"
+        ],
+        "tags": [
+            "ghcr.io/r-lib/rig/debian-12-devel:latest"
+        ]
     }
 ]
diff --git a/containers/ubuntu/Dockerfile b/containers/ubuntu/Dockerfile
index 46d9c7d..3aaa53e 100644
--- a/containers/ubuntu/Dockerfile
+++ b/containers/ubuntu/Dockerfile
@@ -1,6 +1,7 @@
 
+ARG DISTRO=ubuntu
 ARG RELEASE=22.04
-FROM ubuntu:${RELEASE}
+FROM ${DISTRO}:${RELEASE}
 
 ARG RVERSION=release