diff --git a/backend/Makefile b/backend/Makefile
index ce689a792d..e9f0eb60ab 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,10 +1,12 @@
 -include ../setup-env.mk
 
-ifndef COMMIT
-COMMIT := $(shell git rev-parse --short=7 HEAD)
+ARO_HCP_REGISTRY ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
+ARO_HCP_REPOSITORY := arohcpbackend
+
+ifeq ($(strip $(COMMIT)),)
+COMMIT := $(shell az acr repository show-tags --name ${ARO_HCP_IMAGE_ACR} --repository ${ARO_HCP_REPOSITORY} --orderby time_desc --top 1 --output tsv)
 endif
-ARO_HCP_BASE_IMAGE ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
-ARO_HCP_BACKEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpbackend:$(COMMIT)
+ARO_HCP_BACKEND_IMAGE ?= $(ARO_HCP_REGISTRY)/$(ARO_HCP_REPOSITORY):$(COMMIT)
 
 .DEFAULT_GOAL := backend
 
diff --git a/frontend/Makefile b/frontend/Makefile
index 27a7d5b863..d3b107b95d 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -1,10 +1,12 @@
 -include ../setup-env.mk
 
-ifndef COMMIT
-COMMIT := $(shell git rev-parse --short=7 HEAD)
+ARO_HCP_REGISTRY ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
+ARO_HCP_REPOSITORY := arohcpfrontend
+
+ifeq ($(strip $(COMMIT)),)
+COMMIT := $(shell az acr repository show-tags --name ${ARO_HCP_IMAGE_ACR} --repository ${ARO_HCP_REPOSITORY} --orderby time_desc --top 1 --output tsv)
 endif
-ARO_HCP_BASE_IMAGE ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
-ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpfrontend:$(COMMIT)
+ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_REGISTRY)/$(ARO_HCP_REPOSITORY):$(COMMIT)
 
 .DEFAULT_GOAL := frontend