diff --git a/.github/workflows/atlantis-base.yml b/.github/workflows/atlantis-base.yml
index 47dba34d3d..e93c821cb2 100644
--- a/.github/workflows/atlantis-base.yml
+++ b/.github/workflows/atlantis-base.yml
@@ -30,7 +30,7 @@ jobs:
     env:
       DOCKERFILE: "Dockerfile.${{ matrix.image_type }}"
       IMAGE_BASE: ghcr.io/${{ github.repository_owner }}/atlantis-base
-      IMAGE_SUFFIX: ${{ contains(matrix.image_type, 'alpine') && '-alpine' || '' }}
+      IMAGE_SUFFIX: ${{ matrix.image_type != 'alpine' && format('-{0}', matrix.image_type) || '' }}
     steps:
     - uses: actions/checkout@v3
 
diff --git a/.github/workflows/atlantis-image.yml b/.github/workflows/atlantis-image.yml
index 08822d880c..2e95723569 100644
--- a/.github/workflows/atlantis-image.yml
+++ b/.github/workflows/atlantis-image.yml
@@ -27,7 +27,7 @@ jobs:
       RELEASE_TYPE: ${{ contains(github.ref, 'pre') && 'pre' || 'stable' }}
       RELEASE_TAG: ${{ contains(github.ref, 'pre') && 'prerelease-latest' || 'latest' }}
       IMAGE_BASE: ghcr.io/${{ github.repository_owner }}/atlantis
-      IMAGE_SUFFIX: ${{ contains(matrix.image_type, 'alpine') && '-alpine' || '' }}
+      IMAGE_SUFFIX: ${{ matrix.image_type != 'alpine' && format('-{0}', matrix.image_type) || '' }}
     steps:
     - uses: actions/checkout@v3
 
@@ -63,6 +63,7 @@ jobs:
         push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ghcr.io/${{ github.repository_owner }}/atlantis:dev${{ env.IMAGE_SUFFIX }}
+          ghcr.io/${{ github.repository_owner }}/atlantis:dev-${{ matrix.image_type }}
 
     # Publish release to container registry
     - name: Populate release version