diff --git a/Makefile b/Makefile
index c7e26647203..066d4568749 100644
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,28 @@
 # Alternatively, you can set this variable in the .env file
 TARGET_DIR ?= deploy/
 
-# Note that the proper install script is located under ./Utils/build-and-package.pl
-# and that should be used instead. This script is purely for convenience.
-# The perl script bundles the artifacts into a single zip
-.PHONY: install
-install:
-	# Building project
-	mvn clean install package -DskipTests
+.PHONY: clean
+clean:
+	mvn clean
+
+.PHONY: build
+build:
+	mvn install package -DskipTests
+
+.PHONY: package
+package:
 	# Packaging Mage.Client to zip
-	cd Mage.Client && mvn assembly:assembly
+	cd Mage.Client && mvn assembly:single
 	# Packaging Mage.Server to zip
-	cd Mage.Server && mvn assembly:assembly
+	cd Mage.Server && mvn assembly:single
 	# Copying the files to the target directory
 	mkdir -p $(TARGET_DIR)
 	cp ./Mage.Server/target/mage-server.zip $(TARGET_DIR)
 	cp ./Mage.Client/target/mage-client.zip $(TARGET_DIR)
 
+# Note that the proper install script is located under ./Utils/build-and-package.pl
+# and that should be used instead. This script is purely for convenience.
+# The perl script bundles the artifacts into a single zip
+.PHONY: install
+install: clean build package
+