diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml
index d16d232f..25b74726 100644
--- a/molecule/aio/molecule.yml
+++ b/molecule/aio/molecule.yml
@@ -55,7 +55,7 @@ provisioner:
             option: auth allow insecure global id reclaim
             value: false
           - section: mon
-            option: mon data avail warn
+            option: mon_data_avail_warn
             value: 10
       controllers:
       cephs:
diff --git a/roles/mon/tasks/adopt.yml b/roles/mon/tasks/adopt.yml
index 5007c556..65d8b230 100644
--- a/roles/mon/tasks/adopt.yml
+++ b/roles/mon/tasks/adopt.yml
@@ -25,7 +25,7 @@
 #   the rest of the main.yml runs fine
 
 - name: Validate monitor adoption
-  ansible.builtin.command: ceph orch ps
+  ansible.builtin.command: cephadm shell -- ceph orch ps
   register: ps_result
   until: >
     "mon.{{ inventory_hostname_short }}" in ps_result.stdout