diff --git a/Makefile b/Makefile
index ed7d77c..5b5b419 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,11 @@ help: ## This info
 	@echo
 
 build: ## Build Docker containers
-	export TAG=${GIT_HASH} && docker compose build
+	docker compose build
+
+tag: ## Tag Docker images
+	docker tag aviation-ui:latest aviation-ui:${GIT_HASH}
+	docker tag aviation-service:latest aviation-service:${GIT_HASH}
 
 up: ## Start Docker containers
 	docker compose up -d
diff --git a/docker-compose.yml b/docker-compose.yml
index de49880..53c0f70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,8 +57,6 @@ services:
       - "${SERVICE_PORT:-5000}:5000"
     build:
       context: service
-      tags:
-        - aviation-service:${TAG:-latest}
     depends_on:
       - db
       - redis
@@ -78,8 +76,6 @@ services:
       - ${UI_PORT:-3000}:3000
     build:
       context: ui
-      tags:
-        - aviation-ui:${TAG:-latest}
     depends_on:
       - service
     networks:
diff --git a/service/Makefile b/service/Makefile
index e7d35b6..6ef868c 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -13,7 +13,10 @@ help: ## This info
 	@echo
 
 build: ## Build the Docker image
-	export TAG=${GIT_HASH} && docker compose build
+	docker compose build
+
+tag: ## Tag the Docker image
+	docker tag aviation-service:latest aviation-service:${GIT_HASH}
 
 utils: ## Start the utils
 	docker compose up -d db
diff --git a/service/docker-compose.yml b/service/docker-compose.yml
index 18331f7..9e5856d 100644
--- a/service/docker-compose.yml
+++ b/service/docker-compose.yml
@@ -63,8 +63,6 @@ services:
       - "${SERVICE_PORT:-5000}:5000"
     build:
       context: .
-      tags:
-        - aviation-service:${TAG:-latest}
     depends_on:
       - db
       - redis
diff --git a/ui/Makefile b/ui/Makefile
index 8076b0f..76fd8ed 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -13,7 +13,10 @@ help: ## This info
 	@echo
 
 build:  ## Install the dependencies and build
-	export TAG=${GIT_HASH} && docker compose build
+	docker compose build
+
+tag: ## Tag the Docker image
+	docker tag aviation-ui:latest aviation-ui:${GIT_HASH}
 
 up:  ## Start the dev instance
 	docker compose up -d
diff --git a/ui/docker-compose.yml b/ui/docker-compose.yml
index 2912ffa..cb17b48 100644
--- a/ui/docker-compose.yml
+++ b/ui/docker-compose.yml
@@ -13,8 +13,6 @@ services:
     build:
       context: ./
       target: dev
-      tags:
-        - aviation-ui:${TAG:-latest}
     command: "npm run dev"
     volumes:
       - ./src:/app/src