diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fbd76b153..4cc0a34aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,11 @@ on:
 jobs:
   build:
     runs-on: self-hosted
+    env:
+      IMAGE_NAME: petclinic
+      IMAGE_TAG: ${{ github.sha }}
+      ARTIFACTORY_URL: petclinicmac.jfrog.io
+
     steps:
     - uses: actions/checkout@v3
 
@@ -35,11 +40,11 @@ jobs:
     - name: Build Docker Image
       run: |
         # Build Docker image
-        docker build -t $IMAGE_NAME:$IMAGE_TAG .
+        docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
           
         # Tag for Artifactory
-        docker tag $IMAGE_NAME:$IMAGE_TAG $ARTIFACTORY_URL/petclinic-docker/$IMAGE_NAME:$IMAGE_TAG
-        docker tag $IMAGE_NAME:$IMAGE_TAG $ARTIFACTORY_URL/petclinic-docker/$IMAGE_NAME:latest
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/petclinic-docker/${IMAGE_NAME}:${IMAGE_TAG}"
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/petclinic-docker/${IMAGE_NAME}:latest"
     
     - name: Login to Artifactory
       run: |
@@ -47,8 +52,8 @@ jobs:
     
     - name: Push Image to Artifactory
       run: |
-        docker push $ARTIFACTORY_URL/petclinic-docker/$IMAGE_NAME:$IMAGE_TAG
-        docker push $ARTIFACTORY_URL/petclinic-docker/$IMAGE_NAME:latest
+        docker push "${ARTIFACTORY_URL}/petclinic-docker/${IMAGE_NAME}:${IMAGE_TAG}"
+        docker push "${ARTIFACTORY_URL}/petclinic-docker/${IMAGE_NAME}:latest"
     
     # - name: Build Docker Image
     #   run: |