diff --git a/OWNERS b/OWNERS
index f9cd2f9151..e02e1c04ac 100644
--- a/OWNERS
+++ b/OWNERS
@@ -24,7 +24,6 @@ reviewers:
   - marios
   - katarimanojk
   - pojadhav
-  - psathyan
   - queria
   - rachael-george
   - rlandy
diff --git a/roles/libvirt_manager/templates/all-inventory.yml.j2 b/roles/libvirt_manager/templates/all-inventory.yml.j2
index 5f16c439c2..d48ced6fbc 100644
--- a/roles/libvirt_manager/templates/all-inventory.yml.j2
+++ b/roles/libvirt_manager/templates/all-inventory.yml.j2
@@ -1,6 +1,6 @@
 all:
   children:
-{% for vm in _cifmw_libvirt_manager_layout.vms.keys() %}
+{% for vm in _cifmw_libvirt_manager_layout.vms.keys() if _cifmw_libvirt_manager_layout.vms[vm].manage | default(true) %}
     {{ (vm == 'crc') | ternary('ocp', vm) }}s:
       vars:
 {% if _cifmw_libvirt_manager_layout.vms[vm].target is defined %}