diff --git a/api/v1alpha1/osartifact_types.go b/api/v1alpha1/osartifact_types.go
index a2ff806..0e3894b 100644
--- a/api/v1alpha1/osartifact_types.go
+++ b/api/v1alpha1/osartifact_types.go
@@ -49,7 +49,8 @@ type OSArtifactSpec struct {
 	Bundles     []string `json:"bundles,omitempty"`
 	PullOptions Pull     `json:"pull,omitempty"`
 	OSRelease   string   `json:"osRelease,omitempty"`
-	PushOptions Push     `json:"push,omitempty"`
+	// TODO: Currently not used. Reserved to be used when we have a way to push to registries.
+	PushOptions Push `json:"push,omitempty"`
 }
 
 type Push struct {
diff --git a/controllers/job.go b/controllers/job.go
index 411418a..fe0248e 100644
--- a/controllers/job.go
+++ b/controllers/job.go
@@ -65,7 +65,17 @@ func unpackContainer(id, containerImage, pullImage string, pullOptions buildv1al
 	}
 }
 
-func createImageContainer(containerImage string, pushOptions buildv1alpha1.Push) v1.Container {
+func pushImageName(artifact buildv1alpha1.OSArtifact) string {
+	pushName := artifact.Spec.PushOptions.ImageName
+	if pushName != "" {
+		return pushName
+	}
+	return artifact.Name
+}
+
+func createImageContainer(containerImage string, artifact buildv1alpha1.OSArtifact) v1.Container {
+	imageName := pushImageName(artifact)
+
 	return v1.Container{
 		ImagePullPolicy: v1.PullAlways,
 		Name:            "create-image",
@@ -73,8 +83,9 @@ func createImageContainer(containerImage string, pushOptions buildv1alpha1.Push)
 		Command:         []string{"/bin/bash", "-cxe"},
 		Args: []string{
 			fmt.Sprintf(
-				"tar -czvpf test.tar -C /rootfs . && luet util pack %s test.tar image.tar && mv image.tar /artifacts",
-				pushOptions.ImageName,
+				"tar -czvpf test.tar -C /rootfs . && luet util pack %[1]s test.tar %[2]s.tar && chmod +r %[2]s.tar && mv %[2]s.tar /artifacts",
+				imageName,
+				artifact.Name,
 			),
 		},
 		VolumeMounts: []v1.VolumeMount{
@@ -139,8 +150,6 @@ func osReleaseContainer(containerImage string) v1.Container {
 func (r *OSArtifactReconciler) genJob(artifact buildv1alpha1.OSArtifact) *batchv1.Job {
 	objMeta := genObjectMeta(artifact)
 
-	pushImage := artifact.Spec.PushOptions.Push
-
 	privileged := false
 	serviceAccount := true
 
@@ -326,11 +335,7 @@ func (r *OSArtifactReconciler) genJob(artifact buildv1alpha1.OSArtifact) *batchv
 		pod.InitContainers = append(pod.InitContainers, buildGCECloudImageContainer)
 	}
 
-	// TODO: Does it make sense to build the image and not push it? Maybe remove
-	// this flag?
-	if pushImage {
-		pod.InitContainers = append(pod.InitContainers, createImageContainer(r.ToolImage, artifact.Spec.PushOptions))
-	}
+	pod.InitContainers = append(pod.InitContainers, createImageContainer(r.ToolImage, artifact))
 
 	pod.Containers = []v1.Container{
 		createPushToServerImageContainer(r.CopierImage, r.ArtifactPodInfo),