diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml
index 3feb211a03..5fbf1392fa 100644
--- a/deployment/ceph-ansible/ceph-osd.yaml
+++ b/deployment/ceph-ansible/ceph-osd.yaml
@@ -93,7 +93,7 @@ outputs:
                 register: check_docker_cli
                 check_mode: false
               - name: Set noout flag
-                shell: "{{ container_client }} exec -u root ceph-mon-{{ ansible_hostname }} ceph osd set {{ item }}"
+                shell: "{{ container_client }} exec -u root ceph-mon-${HOSTNAME%%.*} ceph osd set {{ item }}"
                 become: true
                 with_items:
                   - noout
@@ -120,7 +120,7 @@ outputs:
         list_concat:
         - {get_attr: [CephBase, role_data, post_upgrade_tasks]}
         - - name: Unset noout flag
-            shell: "{{ container_cli }} exec -u root ceph-mon-{{ ansible_hostname }} ceph osd unset {{ item }}"
+            shell: "{{ container_cli }} exec -u root ceph-mon-${HOSTNAME%%.*} ceph osd unset {{ item }}"
             with_items:
               - noout
               - norecover