diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
index 942e078..ff13b93 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
@@ -303,6 +303,7 @@ public class Runner extends Component {
 
         // Configure data model
         var model = new HashMap<String, Object>();
+        model.put("dataDir", config.dataDir);
         model.put("runtimeDir", config.runtimeDir);
         model.put("firmwareRom", Optional.ofNullable(config.firmwareRom)
             .map(Object::toString).orElse(null));
diff --git a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml
index eb554c6..783b7d9 100644
--- a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml
+++ b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml
@@ -7,7 +7,7 @@
   "arguments":
     - "socket"
     - "--tpm2"
-    - [ "--tpmstate", "dir=${ runtimeDir }" ]
+    - [ "--tpmstate", "dir=${ dataDir }" ]
     - [ "--ctrl", "type=unixio,path=${ runtimeDir }/swtpm-sock,mode=0600" ]
     - "--terminate"