diff --git a/.github/workflows/docker-client.yml b/.github/workflows/docker-client.yml
index c47dbd4..29dc48f 100644
--- a/.github/workflows/docker-client.yml
+++ b/.github/workflows/docker-client.yml
@@ -75,9 +75,9 @@ jobs:
           # Build a docker container and
           # push it to ECR so that it can
           # be deployed to ECS.
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./client
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:client:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:client:$IMAGE_TAG" >> $GITHUB_OUTPUT
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:client ./client
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def
diff --git a/.github/workflows/docker-server.yml b/.github/workflows/docker-server.yml
index b92f43e..e7c49eb 100644
--- a/.github/workflows/docker-server.yml
+++ b/.github/workflows/docker-server.yml
@@ -75,9 +75,9 @@ jobs:
           # Build a docker container and
           # push it to ECR so that it can
           # be deployed to ECS.
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./server
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:server:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:server:$IMAGE_TAG" >> $GITHUB_OUTPUT
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:server ./server
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def