diff --git a/Makefile b/Makefile
index 95aada8..6f5e5b1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,9 @@ $(PASSWD_FILE):
 
 $(LINKS_TARBALL):
 	ln -s /guix-builder/bin bin
-	tar -czvf $@ bin
-	rm bin
+	mkdir etc && ln -s /guix-builder/etc/ssl etc/ssl
+	tar -czvf $@ bin etc
+	rm -r etc bin
 
 $(TARBALL):
 	@cp $$(guix pack -RR -S /bin=bin -S /etc/ssl=etc/ssl -S /lib/locale=lib/locale -m $(GUIX_MANIFEST)) $@
@@ -37,10 +38,12 @@ run: build
           -v /var/guix/daemon-socket/socket:/var/guix/daemon-socket/socket \
           -v /gnu/store:/gnu/store:ro \
           -v /etc/ssl:/etc/ssl:ro \
-          -e HOME=/tmp \
-          -w /tmp \
           $(IMAGE_TAG):latest
 
+.PHONY: run-no-store
+run-no-store: build
+	@docker run --rm -it $(IMAGE_TAG):latest
+
 .PHONY: shell
 shell:
 	@./shell.sh $(GUIX_MANIFEST) $(GUIX_MANIFEST_DEV)