diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index be0e9131ce385..272c40ac57d51 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -491,7 +491,6 @@ jobs:
   services-image-build:
     runs-on: ubuntu-latest
     needs: deploy
-    if: github.event.pull_request.head.repo.full_name == github.repository
 
     strategy:
       matrix:
@@ -513,14 +512,19 @@ jobs:
 
     - name: Build Docker images
       run: |
+        # defines image tag
+        if [[ $GITHUB_REF == refs/tags/* ]]; then IMAGE_TAG="${GITHUB_REF#refs/tags/}"; else IMAGE_TAG="${GITHUB_REF#refs/heads/}"; fi
+
+        # first install repo dependencies
         npm i
 
+        # then micro services dependencies
         cd ./ee/server/services
         npm i
         npm run build
 
-        echo "Building Docker image for service: ${{ matrix.service }}"
+        echo "Building Docker image for service: ${{ matrix.service }}:${IMAGE_TAG}"
 
-        docker build --build-arg SERVICE=${{ matrix.service }} -t rocketchat/${{ matrix.service }}-service .
+        docker build --build-arg SERVICE=${{ matrix.service }} -t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} .
 
         docker push rocketchat/${{ matrix.service }}-service