diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml
index f92cf4e..98db281 100644
--- a/.github/workflows/build-publish-docker.yml
+++ b/.github/workflows/build-publish-docker.yml
@@ -15,9 +15,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Get Tag
-        id: vars
-        run: echo ::set-output name=tag::${git describe --abbrev=0}
+      - name: Determine next semantic version
+        id: determine-version
+        uses: actions/determine-next-semver@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -27,15 +29,16 @@ jobs:
 
       - name: Build image
         run: |
-          docker build -t meysamh66/booking-microservices-flight:${{ steps.vars.outputs.tag }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-identity:${{ steps.vars.outputs.tag }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-passenger:${{ steps.vars.outputs.tag }} -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-booking:${{ steps.vars.outputs.tag }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
+          echo "ENV VERSION={{ steps.determine-version.outputs.next-version }}"
+          docker build -t meysamh66/booking-microservices-flight:${{ steps.determine-version.outputs.next-version }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-identity:${{ steps.determine-version.outputs.next-version }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-passenger:${{ steps.determine-version.outputs.next-version }} -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-booking:${{ steps.determine-version.outputs.next-version }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
 
       - name: Publish image
         run: |
-          docker push meysamh66/booking-microservices-flight:${{ steps.vars.outputs.tag }}
-          docker push meysamh66/booking-microservices-identity:${{ steps.vars.outputs.tag }}
-          docker push meysamh66/booking-microservices-passenger:${{ steps.vars.outputs.tag }}
-          docker push meysamh66/booking-microservices-booking:${{ steps.vars.outputs.tag }}
+          docker push meysamh66/booking-microservices-flight:${{ steps.determine-version.outputs.next-version }}
+          docker push meysamh66/booking-microservices-identity:${{ steps.determine-version.outputs.next-version }}
+          docker push meysamh66/booking-microservices-passenger:${{ steps.determine-version.outputs.next-version }}
+          docker push meysamh66/booking-microservices-booking:${{ steps.determine-version.outputs.next-version }}