diff --git a/Makefile b/Makefile
index 1dce6b54b889b1ad5dca6ff8c62286f676fa2a3c..50ac4d7bd1ceda125bb78a75e3172c6eb94b4113 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,15 @@ push-app-image:
 deploy-local:
 	kustomize build ./deploy | kubectl apply -f -
 
-remove-images:
+remove-images: remove-app-image remove-client-image remove-control-server-image remove-data-server-image remove-control-admin-image
+
+remove-app-image:
 	- docker rmi $(REGISTRY_NAME)/signatrust-app:$(GIT_COMMIT)
+remove-client-image:
 	- docker rmi $(REGISTRY_NAME)/signatrust-client:$(GIT_COMMIT)
-	- docker rmi $(REGISTRY_NAME)/signatrust-data-server:$(GIT_COMMIT)
+remove-control-server-image:
 	- docker rmi $(REGISTRY_NAME)/signatrust-control-server:$(GIT_COMMIT)
+remove-data-server-image:
+	- docker rmi $(REGISTRY_NAME)/signatrust-data-server:$(GIT_COMMIT)
+remove-control-admin-image:
 	- docker rmi $(REGISTRY_NAME)/signatrust-control-admin:$(GIT_COMMIT)
\ No newline at end of file