diff --git a/pungi/ostree/container.py b/pungi/ostree/container.py
index ea7a482b..7a552655 100644
--- a/pungi/ostree/container.py
+++ b/pungi/ostree/container.py
@@ -74,7 +74,7 @@ class Container(OSTree):
             repos = []
             keep_original_sources = True
 
-        update_dict = {}
+        update_dict = {"automatic-version-prefix": self.args.version}
 
         self.treefile = tweak_treeconf(
             self.treefile,
diff --git a/pungi/phases/ostree_container.py b/pungi/phases/ostree_container.py
index 18add3dc..ce2001d2 100644
--- a/pungi/phases/ostree_container.py
+++ b/pungi/phases/ostree_container.py
@@ -121,10 +121,11 @@ class OSTreeContainerThread(WorkerThread):
     ):
         target_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
         util.makedirs(target_dir)
+        version = util.version_generator(compose, config.get("version"))
         archive_name = "%s-%s-%s" % (
             compose.conf["release_short"],
             variant.uid,
-            util.version_generator(compose, config.get("version")),
+            version,
         )
 
         # Run the pungi-make-ostree command locally to create a script to
@@ -137,6 +138,7 @@ class OSTreeContainerThread(WorkerThread):
             "--path=%s" % target_dir,
             "--treefile=%s" % os.path.join(config_repo, config["treefile"]),
             "--extra-config=%s" % extra_config_file,
+            "--version=%s" % version,
         ]
 
         _, runroot_script = shortcuts.run(cmd, universal_newlines=True)