diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index 6316ac04..132ccb81 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -45,7 +45,7 @@ ifeq ("$CONTINUOUS_INTEGRATION", "")
 	XZ =
 	SIGN =
 else
-    XZ = xz --no-warn --verbose --keep --threads=0 -3
+    XZ = xz --no-warn --verbose --keep --threads=0 -3 $(IMAGE)
     SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
 endif
 
@@ -95,7 +95,7 @@ beaglebone: prep
 	$(eval MACHINE = beaglebone)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -106,7 +106,7 @@ cubieboard2: prep
 	$(eval MACHINE = cubieboard2)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -117,7 +117,7 @@ pcduino3: prep
 	$(eval MACHINE = pcduino3)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -128,7 +128,7 @@ cubietruck: prep
 	$(eval MACHINE = cubietruck)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -140,7 +140,7 @@ a20-olinuxino-lime: prep
 	$(eval IMAGE = $(NAME).img)
 	$(MAKE_IMAGE)
 	rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 
@@ -150,7 +150,7 @@ a20-olinuxino-lime2: prep
 	$(eval MACHINE = a20-olinuxino-lime2)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -161,7 +161,7 @@ a20-olinuxino-micro: prep
 	$(eval MACHINE = a20-olinuxino-micro)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -172,7 +172,7 @@ i386: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -183,7 +183,7 @@ i686: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -194,7 +194,7 @@ amd64: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -205,7 +205,7 @@ apu: prep
 	$(eval MACHINE = all)
 	$(MAKE_IMAGE)
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -220,7 +220,7 @@ qemu-i386: prep
 	# Convert image to qemu format
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."
@@ -232,7 +232,7 @@ qemu-x86_64: prep
 	# Convert image to qemu format
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
 	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
+	$(XZ)
 	@echo ""
 	$(SIGN)
 	@echo "Build complete."