diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index f632fe7..101e4c0 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -14,31 +14,41 @@ jobs:
     strategy:
       matrix:
         include:
-          - tag: "0.9.2.0"
+          - tag: >
+              soupbowl/opensimulator:0.9.2.0,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.2.0,
             version: "0.9.2.0"
             folder: build/latest
             file: Dockerfile.mono
             platforms: linux/amd64,linux/arm64
             sha1: 584966ef6029f21dc842a7f55f6f117b3a0b0321
-          - tag: "0.9.2.1"
+          - tag: >
+              soupbowl/opensimulator:0.9.2.1,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.2.1,
             version: "0.9.2.1"
             folder: build/latest
             file: Dockerfile.mono
             platforms: linux/amd64,linux/arm64
             sha1: c5d2e690a7739fa9c0651845b31d912f88d6fa22
-          - tag: "0.9.2.2"
+          - tag: >
+              soupbowl/opensimulator:0.9.2,
+              soupbowl/opensimulator:0.9.2.2,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.2,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.2.2,
             version: "0.9.2.2"
             folder: build/latest
             file: Dockerfile.mono
             platforms: linux/amd64,linux/arm64
             sha1: b280d109cf04755a02db1c729af5a5e4160d1ce6
-          - tag: "0.9.3.0"
-            version: "0.9.3.0"
-            folder: build/latest
-            file: Dockerfile
-            platforms: linux/amd64,linux/arm64
-            sha1: a4bcd861626195af80cc1f962d3a2f4528859ad2
-          - tag: "latest"
+          - tag: >
+              soupbowl/opensimulator:latest,
+              soupbowl/opensimulator:0.9,
+              soupbowl/opensimulator:0.9.3,
+              soupbowl/opensimulator:0.9.3.0,
+              ghcr.io/soup-bowl/opensimulator-docker:latest,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.3,
+              ghcr.io/soup-bowl/opensimulator-docker:0.9.3.0,
             version: "0.9.3.0"
             folder: build/latest
             file: Dockerfile
@@ -74,9 +84,7 @@ jobs:
         with:
           push: true
           context: "{{defaultContext}}:${{ matrix.folder }}"
-          tags: >
-            soupbowl/opensimulator:${{ matrix.tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }},
+          tags: ${{ matrix.tag }}
           platforms: ${{ matrix.platforms }}
           file: "${{ matrix.file }}"
           build-args: |