diff --git a/Makefile b/Makefile
index 9f11e39c..35c7423a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ docker-build:
 	@echo "Building JupyterLab images..."
 	$(foreach target, base jupyter, \
 		docker build \
-		    --build-arg="BASE_IMG=$(EZKF_REGISTRY)/base:$(VERSION)" \
+		  --build-arg="BASE_IMG=$(EZKF_REGISTRY)/base:$(VERSION)" \
 			-t $(EZKF_REGISTRY)/$(target):$(VERSION) \
 			-f $(TOPDIR)/dockerfiles/notebooks/$(target)/Dockerfile \
 			$(TOPDIR)/dockerfiles/notebooks/$(target); \
@@ -26,6 +26,14 @@ docker-build:
 			$(TOPDIR)/demos/rag-demos/question-answering/dockerfiles/$(target); \
 	)
 
+	@echo "Building the images for the Question-Answering GPU demo..."
+	$(foreach target, app transformer vectorstore triton-inference-server, \
+		docker build \
+			-t $(EZKF_REGISTRY)/qna-$(target)-gpu:$(VERSION) \
+			-f $(TOPDIR)/demos/rag-demos/question-answering-gpu/dockerfiles/$(target)/Dockerfile \
+			$(TOPDIR)/demos/rag-demos/question-answering-gpu/dockerfiles/$(target); \
+	)
+
 	@echo "Building the images for the Fraud Detection demo..."
 	docker build \
 		-t $(EZKF_REGISTRY)/fraud-detection-app:$(VERSION) \
@@ -43,6 +51,11 @@ docker-push:
 		docker push $(EZKF_REGISTRY)/qna-$(target):$(VERSION); \
 	)
 
+	@echo "Pushing the images for the Question-Answering GPU demo..."
+	$(foreach target, app transformer vectorstore triton-inference-server, \
+		docker push $(EZKF_REGISTRY)/qna-$(target)-gpu:$(VERSION); \
+	)
+
 	@echo "Pushing the images for the Fraud Detection demo..."
 	docker push $(EZKF_REGISTRY)/fraud-detection-app:$(VERSION)
 
@@ -70,6 +83,10 @@ images:
 	@echo $(EZKF_REGISTRY)/qna-llm:$(VERSION)
 	@echo $(EZKF_REGISTRY)/qna-transformer:$(VERSION)
 	@echo $(EZKF_REGISTRY)/qna-vectorstore:$(VERSION)
+	@echo $(EZKF_REGISTRY)/qna-app-gpu:$(VERSION)
+	@echo $(EZKF_REGISTRY)/qna-transformer-gpu:$(VERSION)
+	@echo $(EZKF_REGISTRY)/qna-vectorstore-gpu:$(VERSION)
+	@echo $(EZKF_REGISTRY)/qna-triton-inference-server-gpu:$(VERSION)
 	@echo $(EZKF_REGISTRY)/fraud-detection-app:$(VERSION)
 
 release: docker-build docker-push