diff --git a/terraform/main.tf b/terraform/main.tf
index d542bfd..1cc339f 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -25,11 +25,12 @@ resource "null_resource" "stage_talos_image" {
     image_url     = local.talos_iso_download_url
     storage       = var.talos_image_storage
     talos_version = var.talos_version
+    filename      = "talos-${trimprefix(var.talos_version, "v")}-${substr(var.talos_factory_schematic_id, 0, 12)}-${var.talos_image_architecture}.iso"
   }
 
   provisioner "local-exec" {
     interpreter = ["python", "-c"]
-    command     = "import subprocess; subprocess.run(['python', r'${path.module}/scripts/stage_talos_image.py', '--api-url', '${var.proxmox_api_url}', '--api-token', '${var.proxmox_api_token}', '--node', '${each.value}', '--storage', '${var.talos_image_storage}', '--image-url', '${local.talos_iso_download_url}'], check=True)"
+    command     = "import subprocess; subprocess.run(['python', r'${path.module}/scripts/stage_talos_image.py', '--api-url', '${var.proxmox_api_url}', '--api-token', '${var.proxmox_api_token}', '--node', '${each.value}', '--storage', '${var.talos_image_storage}', '--image-url', '${local.talos_iso_download_url}', '--filename', '${self.triggers.filename}'], check=True)"
   }
 }
 
diff --git a/terraform/scripts/stage_talos_image.py b/terraform/scripts/stage_talos_image.py
index 55b1621..35dcf07 100644
--- a/terraform/scripts/stage_talos_image.py
+++ b/terraform/scripts/stage_talos_image.py
@@ -22,8 +22,7 @@ def api_request(base_url, token, method, path, data=None):
         return json.loads(response.read().decode())
 
 
-def ensure_image(base_url, token, node, storage, image_url):
-    filename = os.path.basename(urllib.parse.urlparse(image_url).path)
+def ensure_image(base_url, token, node, storage, image_url, filename):
     content_path = f"/api2/json/nodes/{node}/storage/{storage}/content"
     response = api_request(base_url, token, "GET", content_path)
     for item in response.get("data", []):
@@ -46,10 +45,11 @@ def main():
     parser.add_argument("--node", required=True)
     parser.add_argument("--storage", required=True)
     parser.add_argument("--image-url", required=True)
+    parser.add_argument("--filename", required=True)
     args = parser.parse_args()
 
     try:
-        filename, downloaded = ensure_image(args.api_url, args.api_token, args.node, args.storage, args.image_url)
+        filename, downloaded = ensure_image(args.api_url, args.api_token, args.node, args.storage, args.image_url, args.filename)
     except urllib.error.HTTPError as exc:
         sys.stderr.write(exc.read().decode())
         raise