diff --git a/imagefactory/Makefile b/imagefactory/Makefile
index 71e7b8c64..dc37d5d91 100644
--- a/imagefactory/Makefile
+++ b/imagefactory/Makefile
@@ -17,6 +17,7 @@ overcloud-control:
 		--parameter utility_image $(UTILITY_IMAGE_ID) \
 		--file-parameter utility_customizations dib_overcloud_control.tdl \
 		--parameter results_location "/overcloud-control.tar" indirection
+	tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1)
 
 overcloud-compute:
 	imagefactory --debug \
@@ -25,6 +26,7 @@ overcloud-compute:
 		--parameter utility_image $(UTILITY_IMAGE_ID) \
 		--file-parameter utility_customizations dib_overcloud_compute.tdl \
 		--parameter results_location "/overcloud-compute.tar" indirection
+	tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1)
 
 overcloud-cinder-volume:
 	imagefactory --debug \
@@ -33,6 +35,7 @@ overcloud-cinder-volume:
 		--parameter utility_image $(UTILITY_IMAGE_ID) \
 		--file-parameter utility_customizations dib_overcloud_cinder_volume.tdl \
 		--parameter results_location "/overcloud-cinder-volume.tar" indirection
+	tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1)
 
 overcloud-swift-storage:
 	imagefactory --debug \
@@ -41,6 +44,7 @@ overcloud-swift-storage:
 		--parameter utility_image $(UTILITY_IMAGE_ID) \
 		--file-parameter utility_customizations dib_overcloud_swift_storage.tdl \
 		--parameter results_location "/overcloud-swift-storage.tar" indirection
+	tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1)
 
 deploy-ramdisk-ironic:
 	imagefactory --debug \
@@ -49,4 +53,5 @@ deploy-ramdisk-ironic:
 		--parameter utility_image $(UTILITY_IMAGE_ID) \
 		--file-parameter utility_customizations dib_deploy_ramdisk_ironic.tdl \
 		--parameter results_location "/deploy-ramdisk-ironic.tar" indirection
+	tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1)