diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
index 8194c90..7aaae51 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
@@ -7,6 +7,8 @@ metadata:
     app.kubernetes.io/name: ${ constants.APP_NAME }
     app.kubernetes.io/instance: ${ cr.metadata.name.asString }
     app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME }
+  annotations:
+    vmoperator.jdrupes.org/version: ${ managerVersion }
   ownerReferences:
   - apiVersion: ${ cr.apiVersion.asString }
     kind: ${ constants.VM_OP_KIND_VM }
diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerService.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerService.ftl.yaml
index c22c14b..e103cdb 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerService.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerService.ftl.yaml
@@ -7,6 +7,8 @@ metadata:
     app.kubernetes.io/name: ${ constants.APP_NAME }
     app.kubernetes.io/instance: ${ cr.metadata.name.asString }
     app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME }
+  annotations:
+    vmoperator.jdrupes.org/version: ${ managerVersion }
   ownerReferences:
   - apiVersion: ${ cr.apiVersion.asString }
     kind: ${ constants.VM_OP_KIND_VM }
diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerSts.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerSts.ftl.yaml
index 4c42328..707d35e 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerSts.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerSts.ftl.yaml
@@ -7,6 +7,8 @@ metadata:
     app.kubernetes.io/name: ${ constants.APP_NAME }
     app.kubernetes.io/instance: ${ cr.metadata.name.asString }
     app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME }
+  annotations:
+    vmoperator.jdrupes.org/version: ${ managerVersion }
   ownerReferences:
   - apiVersion: ${ cr.apiVersion.asString }
     kind: ${ constants.VM_OP_KIND_VM }
@@ -27,11 +29,13 @@ spec:
       labels:
         app.kubernetes.io/name: ${ constants.APP_NAME }
         app.kubernetes.io/instance: ${ cr.metadata.name.asString }
+        app.kubernetes.io/component: ${ constants.APP_NAME }
         app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME }
       annotations:
         # Triggers update of config map mounted in pod
         # See https://ahmet.im/blog/kubernetes-secret-volumes-delay/
         vmrunner.jdrupes.org/cmVersion: "${ cm.metadata.resourceVersion.asString }"
+        vmoperator.jdrupes.org/version: ${ managerVersion }
     spec:
       containers:
       - name: ${ cr.metadata.name.asString }
diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
index 595a9d7..b23a747 100644
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
@@ -38,6 +38,7 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import static org.jdrupes.vmoperator.manager.Constants.VM_OP_GROUP;
 import org.jdrupes.vmoperator.manager.VmDefChanged.Type;
 import org.jdrupes.vmoperator.util.ExtendedObjectWrapper;
@@ -148,6 +149,9 @@ public class Reconciler extends Component {
             throws TemplateModelException {
         @SuppressWarnings("PMD.UseConcurrentHashMap")
         Map<String, Object> model = new HashMap<>();
+        model.put("managerVersion",
+            Optional.ofNullable(Reconciler.class.getPackage()
+                .getImplementationVersion()).orElse("(Unknown)"));
         model.put("cr", vmDef);
         model.put("constants",
             (TemplateHashModel) new DefaultObjectWrapperBuilder(