diff --git a/Makefile b/Makefile
index 25ee23a..6522b4e 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,12 @@ _LORAX_TEMPLATES += $(call get_templates,secureboot)
 _TEMPLATE_VARS   += ENROLLMENT_PASSWORD
 endif
 
+ifneq ($(IMAGE_TAR),)
+_IMAGE_TARGET := container/$(IMAGE_NAME)-$(IMAGE_TAG)-tar
+else
+_IMAGE_TARGET := container/$(IMAGE_NAME)-$(IMAGE_TAG)
+endif
+
 _SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test
 
 # Create checksum
@@ -94,7 +100,7 @@ $(ISO_NAME)-CHECKSUM: $(ISO_NAME)
 	cd $(dir $(ISO_NAME)) && sha256sum $(notdir $(ISO_NAME)) > $(notdir $(ISO_NAME))-CHECKSUM
 
 # Build end ISO
-$(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
+$(ISO_NAME): results/images/boot.iso $(_IMAGE_TARGET) xorriso/input.txt
 	$(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME)); chmod ugo=rwX $(dir $(ISO_NAME)))
 	xorriso -dialog on < xorriso/input.txt
 	implantisomd5 $(ISO_NAME)
diff --git a/Makefile.inputs b/Makefile.inputs
index 51804c3..44283e0 100644
--- a/Makefile.inputs
+++ b/Makefile.inputs
@@ -8,6 +8,7 @@ export IMAGE_NAME              := base
 export IMAGE_REPO              := quay.io/fedora-ostree-desktops
 export IMAGE_TAG                = $(VERSION)
 export IMAGE_SIGNED            := true
+export IMAGE_TAR               :=
        REPOS                   := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
 export ROOTFS_SIZE             := 4
 export VARIANT                 := Server
diff --git a/container/Makefile b/container/Makefile
index 88024a0..158f8cc 100644
--- a/container/Makefile
+++ b/container/Makefile
@@ -1,6 +1,9 @@
 $(IMAGE_NAME)-$(IMAGE_TAG):
 	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
 
+$(IMAGE_NAME)-$(IMAGE_TAG)-tar:
+	skopeo copy oci-archive:$(IMAGE_TAR) oci:$(IMAGE_NAME):$(IMAGE_TAG)
+
 install-deps:
 	$(install_pkg) skopeo
 
@@ -8,4 +11,4 @@ FILES=$(filter-out Makefile,$(wildcard *))
 clean:
 ifneq ($(FILES),)
 	rm -Rf $(FILES)
-endif
\ No newline at end of file
+endif