diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 1ad9f6a..89b0ddc 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -33,27 +33,21 @@ jobs:
     - name: Log in to GitHub Docker Registry
       uses: docker/login-action@v2
       with:
-        registry: containers.vlink.dev
+        registry: ${{ env.IMAGE_REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    
-    - name: Build the Docker image
-      run: docker build . --file ${{ DOCKERFILE_PATH }} --tag ${{ IMAGE_REPO }}}/${{ IMAGE_NAME }}:${{ IAMGE_TAG }}
       
     - name: Build and push Docker image with version number
       uses: docker/build-push-action@v4
       with:
         push: true
         tags: |
-          ${{ IMAGE_REPO }}}/${{ IMAGE_NAME }}:${{ IAMGE_TAG }}
+          ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}}/${{ env.IMAGE_NAME }}:${{ env.IAMGE_TAG }}
           
-    - name: Retag the image to latest tag
-      run: docker tag ${{ IMAGE_REPO }}}/${{ IMAGE_NAME }}:${{ IAMGE_TAG }} ${{ IMAGE_REPO }}}/${{ IMAGE_NAME }}:latest
-      
       
     - name: Build and push Docker image with latest
       uses: docker/build-push-action@v4
       with:
         push: true
         tags: |
-          ${{ IMAGE_REPO }}}/${{ IMAGE_NAME }}:latest
+          ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}}/${{ env.IMAGE_NAME }}:latest