diff --git a/Makefile b/Makefile
index 89a8e0b..787f6d0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@ S=./scripts
 
 #############################################################################
 # Tunable parameters are in this section
-ALPINE_VERSION?=latest
 FACTORY_IMAGE?=factory.img
-SD_SIZE?=250M
+SD_SIZE?=4G
 RESOURCES_SIZE?=8M
-ROOTFS_SIZE?=100M
+ROOTFS_SIZE?=2G
+DATA_SIZE?=512M
 #############################################################################
 
 SPL=$(A)/spl.img
@@ -25,10 +25,13 @@ INITRD=$(A)/initramfs
 FIRMWARE_TAR=$(A)/firmware.tar
 MODULES_TAR=$(A)/modules.tar
 ROOTFS_TAR=$(A)/rootfs.tar
+CORES_TAR=$(A)/cores.tar
+ESDE_TAR=$(A)/esde.tar
 CONFIG_TAR=$(A)/config.tar
 ROOTFS=$(A)/rootfs.img
-IMAGES=$(SPL) $(UBOOT) $(ENV) $(RESOURCES) $(BOOT) $(ROOTFS)
-SD=$(A)/alpine-h700.img
+DATA=$(A)/data.img
+IMAGES=$(SPL) $(UBOOT) $(ENV) $(RESOURCES) $(BOOT) $(ROOTFS) $(DATA)
+SD=$(A)/alarm-h700.img
 
 sdcard: $(SD)
 
@@ -52,7 +55,7 @@ $(KERNEL) $(BOOTCFG): $(FACTORY_IMAGE)
 	$(S)/extract-kernel.sh $^ $(A)
 
 $(INITRD):
-	$(S)/mkinitrd.sh $(ALPINE_VERSION)
+	$(S)/mkinitrd.sh
 
 $(RESOURCES): $(shell find $(R) -type f -print0 | xargs -0)
 	$(RM) $@
@@ -60,7 +63,13 @@ $(RESOURCES): $(shell find $(R) -type f -print0 | xargs -0)
 	$(S)/mkfsimage.sh $@ 0 vfat resources $(R)
 
 $(ROOTFS_TAR):
-	$(S)/build-rootfs.sh $(ALPINE_VERSION) $(A)
+	$(S)/build-alarm-rootfs.sh $(A)
+
+$(CORES_TAR):
+	$(S)/install-cores.sh $(A)
+
+$(ESDE_TAR):
+	$(S)/install-esde.sh $(A)
 
 $(FIRMWARE_TAR) $(MODULES_TAR): $(FACTORY_IMAGE)
 	$(S)/extract-modules.sh $< $(A)
@@ -69,10 +78,15 @@ $(CONFIG_TAR): $(shell find $(C) -type f -print0 | xargs -0)
 	date --utc "+%Y-%m-%dT%H:%M:%SZ" >$(C)/.build
 	fakeroot -- tar cf $@ --exclude .gitkeep -C $(C) .
 
-$(ROOTFS): $(ROOTFS_TAR) $(FIRMWARE_TAR) $(MODULES_TAR) $(CONFIG_TAR)
+$(ROOTFS): $(ROOTFS_TAR) $(FIRMWARE_TAR) $(MODULES_TAR) $(CORES_TAR) $(ESDE_TAR) $(CONFIG_TAR)
 	$(RM) $@
 	truncate -s $(ROOTFS_SIZE) $@
-	$(S)/mkfsimage.sh $@ 0 ext4 rootfs $(ROOTFS_TAR) $(FIRMWARE_TAR):/lib/firmware/ $(MODULES_TAR):/lib/modules/ $(CONFIG_TAR)
+	$(S)/mkfsimage.sh $@ 0 ext4 rootfs $(ROOTFS_TAR) $(FIRMWARE_TAR):/lib/firmware/ $(MODULES_TAR):/lib/modules/ $(CORES_TAR) $(ESDE_TAR) $(CONFIG_TAR)
+
+$(DATA):
+	$(RM) $@
+	truncate -s $(DATA_SIZE) $@
+	$(S)/mkdata.sh $@
 
 clean:
 	$(RM) $(A)/*