diff --git a/.github/workflows/push_docker.yml b/.github/workflows/push_docker.yml
index 762fe17..ca5dbcd 100644
--- a/.github/workflows/push_docker.yml
+++ b/.github/workflows/push_docker.yml
@@ -23,17 +23,18 @@ jobs:
                   password: ${{ secrets.DOCKER_PASSWORD }}
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v2
-            - name: Tag image
-              run: |
-                if [ "${{ matrix.module }}" == "" ]; then
-                  echo "IMAGE_TAG_SUFFIX=-light" >> "$GITHUB_OUTPUT"
-                elif [ "${{ matrix.module }}" == "api" ]; then
-                  echo "IMAGE_TAG_SUFFIX=-api" >> "$GITHUB_OUTPUT"
-                elif [ "${{ matrix.module }}" == "metrics" ]; then
-                  echo "IMAGE_TAG_SUFFIX=-metrics" >> "$GITHUB_OUTPUT"
-                else
-                  echo "IMAGE_TAG_SUFFIX=" >> "$GITHUB_OUTPUT
-                fi
+            - name: Tag default image
+              if: ${{ matrix.module == "api,metrics" }}
+              run: echo "IMAGE_TAG_SUFFIX=" >> "$GITHUB_OUTPUT"
+            - name: Tag api image
+              if: ${{ matrix.module == "api" }}
+              run: echo "IMAGE_TAG_SUFFIX=-api" >> "$GITHUB_OUTPUT" 
+            - name: Tag metrics image
+              if: ${{ matrix.module == "metrics" }}
+              run: echo "IMAGE_TAG_SUFFIX=-metrics" >> "$GITHUB_OUTPUT" 
+            - name: Tag light image
+              if: ${{ matrix.module == "" }}
+              run: echo "IMAGE_TAG_SUFFIX=light" >> "$GITHUB_OUTPUT"  
             - name: Build and push
               uses: docker/build-push-action@v4
               with: