diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index def0b2f..0e6cd2a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,9 +64,9 @@ jobs:
         platforms: linux/amd64,linux/arm/v7,linux/arm64
         push: true
         tags: |
+          ghcr.io/homebridge/homebridge:latest
+          ghcr.io/homebridge/homebridge:ubuntu
           ghcr.io/homebridge/homebridge:${{ steps.image_tag.outputs.IMAGE_TAG }}
-          ghcr.io/homebridge/homebridge:${{ steps.alt_image_tag.outputs.ALT_IMAGE_TAG }}
-          ghcr.io/homebridge/homebridge:${{ steps.versioned_image_tag.outputs.VERSION_IMAGE_TAG }}
 
     - name: Log into Docker Hub
       uses: docker/login-action@v3
@@ -85,7 +85,7 @@ jobs:
         platforms: linux/amd64,linux/arm/v7,linux/arm64
         push: true
         tags: |
+          homebridge/homebridge:latest
+          homebridge/homebridge:ubuntu
           homebridge/homebridge:${{ steps.image_tag.outputs.IMAGE_TAG }}
-          homebridge/homebridge:${{ steps.alt_image_tag.outputs.ALT_IMAGE_TAG }}
-          homebridge/homebridge:${{ steps.versioned_image_tag.outputs.VERSION_IMAGE_TAG }}