diff --git a/lib/PSEXETarget.mk b/lib/PSEXETarget.mk
index 96ac9fa8..bd5fbf66 100644
--- a/lib/PSEXETarget.mk
+++ b/lib/PSEXETarget.mk
@@ -4,4 +4,7 @@ $(TARGET).elf: $(OBJS)
 
 #Strips the psexe
 $(TARGET).psexe: $(TARGET).elf
-	$(PREFIX)-objcopy $(addprefix -R , $(OVERLAYSECTION)) -O binary $< $@
\ No newline at end of file
+	$(PREFIX)-objcopy $(addprefix -R , $(OVERLAYSECTION)) -O binary $< $@
+
+#Rules section for default compilation and linking
+all: $(TARGET).psexe $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)Overlay$(ovl))
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile
index ab36f856..92096c34 100644
--- a/template/JabyEngine-PSX_Game/application/Makefile
+++ b/template/JabyEngine-PSX_Game/application/Makefile
@@ -10,9 +10,6 @@ LIBS = -L$(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE) -lJabyEngine
 include $(JABY_ENGINE_DIR)/lib/Makefile
 include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
 
-#Rules section for default compilation and linking
-all: $(TARGET).psexe
-
 clean:
 	rm -fr $(OUTPUT_DIR)
 	rm -fr ../iso/*.bin