diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/check-pr.yml
similarity index 71%
rename from .github/workflows/build-and-test.yml
rename to .github/workflows/check-pr.yml
index 2d8496c..1ba1857 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/check-pr.yml
@@ -1,4 +1,4 @@
-name: Build and test
+name: Check PR
 
 on:
   pull_request:
@@ -6,21 +6,19 @@ on:
       - master
 
 env:
-  REGISTRY: docker.io
   IMAGE_NAME: cdalvaro/saltstack-master
   IMAGE_TAG: ci
-  GITHUB_REF_NAME: ${{ github.event.release.tag_name }}
 
 jobs:
   build:
-    name: Build Docker image
+    name: Build image
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
       - name: Set env variables
         run: |
-          echo ::set-env name=CACHE_FROM::"${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
-          echo ::set-env name=DOCKER_IMAGE::"${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}"
+          echo ::set-env name=CACHE_FROM::"${{ env.IMAGE_NAME }}:latest"
+          echo ::set-env name=DOCKER_IMAGE::"${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}"
 
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -31,15 +29,15 @@ jobs:
       - name: Build Docker image
         run: |
           docker build \
-            --build-arg VCS_REF=${GITHUB_REF_NAME:-${GITHUB_SHA}} \
+            --build-arg VCS_REF="${GITHUB_SHA::7}" \
             --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
             --cache-from ${CACHE_FROM} \
-            --tag ${DOCKER_IMAGE} .
+            --tag "${DOCKER_IMAGE}" .
 
       - name: Save docker image
         run: |
           mkdir -p docker/
-          docker save -o docker/docker-image.tar ${DOCKER_IMAGE}
+          docker save -o docker/docker-image.tar "${DOCKER_IMAGE}"
 
       - name: Upload image for test job
         uses: actions/upload-artifact@v2
@@ -48,7 +46,7 @@ jobs:
           path: docker/docker-image.tar
 
   test:
-    name: Test Docker image
+    name: Test image
     needs: build
     runs-on: ubuntu-latest
     env:
@@ -64,7 +62,7 @@ jobs:
         run: docker load -i docker/docker-image.tar
 
       - name: Launch docker container
-        run: docker run --rm -d --name "${CONTAINER_NAME}" "${IMAGE_NAME}:${IMAGE_TAG}"
+        run: docker run --rm -d --name "${CONTAINER_NAME}" "${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}"
 
       - name: Show container info
         run: docker container ls