diff --git a/hack/keycloak-themes/Makefile b/hack/keycloak-themes/Makefile
index 11a980f77..79bfd4557 100644
--- a/hack/keycloak-themes/Makefile
+++ b/hack/keycloak-themes/Makefile
@@ -1,8 +1,10 @@
-KEYCLOAK_THEME_DIR ?= hack/keycloak-themes
+KEYCLOAK_THEME_DIR ?= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 JAR_THEME_FILE ?= cloudpak-theme.jar
 
 default: cloudpak-theme.jar
 
+.PHONY: cloudpak-theme.jar
 cloudpak-theme.jar:
 	@echo "Building the keycloak jar theme..."
-	@(cd $(KEYCLOAK_THEME_DIR) && zip -r ./$(JAR_THEME_FILE) META-INF theme)
\ No newline at end of file
+	rm ./$(JAR_THEME_FILE)
+	(cd $(KEYCLOAK_THEME_DIR) && zip -r ./$(JAR_THEME_FILE) META-INF theme)
\ No newline at end of file