diff --git a/packer/build.pkr.hcl b/packer/build.pkr.hcl
index 118307b..148ffb6 100644
--- a/packer/build.pkr.hcl
+++ b/packer/build.pkr.hcl
@@ -20,7 +20,8 @@ build {
     playbook_file    = "ansible/playbook.yml"
     user             = "ubuntu"
     ansible_env_vars = [
-      "ANSIBLE_CONFIG=ansible/ansible.cfg"
+      "ANSIBLE_CONFIG=ansible/ansible.cfg",
+      "PYTHONUNBUFFERED=1"
     ]
     use_proxy        = "false"
     extra_arguments  = [
@@ -35,11 +36,11 @@ build {
     inline = [
       "pwsh -command \"& scripts/Update-OvfConfiguration.ps1 \\",
       " -ApplianceType '${source.name} \\",
-      " -OVFFile '/scratch/airgapped-k8s/${var.vm_name}.ovf' \"",
+      " -OVFFile '/scratch/airgapped-k8s/${var.vm_name}-${source.name}.ovf' \"",
       "pwsh -file scripts/Update-Manifest.ps1 \\",
-      " -ManifestFileName '/scratch/airgapped-k8s/${var.vm_name}.mf'",
+      " -ManifestFileName '/scratch/airgapped-k8s/${var.vm_name}-${source.name}.mf'",
       "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
-      " '/scratch/airgapped-k8s/${var.vm_name}.ovf' \\",
+      " '/scratch/airgapped-k8s/${var.vm_name}-${source.name}.ovf' \\",
       " /output/airgapped-k8s.${source.name}.ova"
     ]
   }