diff --git a/Makefile b/Makefile
index ae394cc..91ff94f 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@
 
 all: rootfs home bootloader partition-table
 
-dist: package-images sign-images
+dist: package-images sign-images package-sd-image sign-sd-image
 
 lintian: packages
 	lintian $(PRODUCT_OUT)/packages/core/*.deb $(PRODUCT_OUT)/packages/bsp/*.deb
diff --git a/multistrap.mk b/multistrap.mk
index 05daff6..466291f 100644
--- a/multistrap.mk
+++ b/multistrap.mk
@@ -39,12 +39,8 @@
 	sudo mkdir -p $(MULTISTRAP_WORK_DIR)/boot $(MULTISTRAP_WORK_DIR)/dev
 	sudo mount -o loop $(PRODUCT_OUT)/multistrap/boot_$(USERSPACE_ARCH).img $(MULTISTRAP_WORK_DIR)/boot
 
-ifeq ($(IS_JENKINS),)
-	cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)/multistrap
-else
-	cp $(ROOTDIR)/board/multistrap-jenkins.conf $(PRODUCT_OUT)/multistrap/multistrap.conf
+	cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)/multistrap/multistrap.conf
 	sed -i -e 's/RELEASE_NAME/$(RELEASE_NAME)/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
-endif
 
 	sed -i -e 's/USERSPACE_ARCH/$(USERSPACE_ARCH)/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
 	sed -i -e 's/MAIN_PACKAGES/$(PACKAGES_EXTRA) $(BOARD_NAME)-core/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
diff --git a/rootfs.mk b/rootfs.mk
index 28c1729..32b1410 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -77,12 +77,8 @@
 	-sudo umount $(ROOTFS_DIR)
 	sudo mount -o loop $(ROOTFS_RAW_IMG) $(ROOTFS_DIR)
 
-ifeq ($(IS_JENKINS),)
-	cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)
-else
-	cp $(ROOTDIR)/board/multistrap-jenkins.conf $(PRODUCT_OUT)/multistrap.conf
+	cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)/multistrap.conf
 	sed -i -e 's/RELEASE_NAME/$(RELEASE_NAME)/g' $(PRODUCT_OUT)/multistrap.conf
-endif
 
 	sed -i -e 's/MAIN_PACKAGES/$(PACKAGES_EXTRA)/g' $(PRODUCT_OUT)/multistrap.conf
 	sed -i -e 's/USERSPACE_ARCH/$(USERSPACE_ARCH)/g' $(PRODUCT_OUT)/multistrap.conf