diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 9f37e97c..5d6d5abd 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -140,6 +140,12 @@ jobs:
           docker build -t authorization_server authorization_server/
           docker build -t client client/
 
+      - name: Create Docker tags
+        run: |
+          docker tag resource_server $DOCKER_REPOSITORY:resource_server_latest
+          docker tag authorization_server $DOCKER_REPOSITORY:authorization_server_latest
+          docker tag client $DOCKER_REPOSITORY:client_latest
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -148,6 +154,6 @@ jobs:
 
       - name: Push Docker images
         run: |
-          docker push $DOCKER_REPOSITORY/resource_server:latest
-          docker push $DOCKER_REPOSITORY/authorization_server:latest
-          docker push $DOCKER_REPOSITORY/client:latest
\ No newline at end of file
+          docker push $DOCKER_REPOSITORY:resource_server_latest
+          docker push $DOCKER_REPOSITORY:authorization_server_latest
+          docker push $DOCKER_REPOSITORY:client_latest
\ No newline at end of file