diff --git a/ansible/kayobe-ansible-user.yml b/ansible/kayobe-ansible-user.yml
index cfb6bdcf01a1c0d121e05b8a2582be4a5e691c05..cd1e8637be53793f410fc55f633e4ad54064ff31 100644
--- a/ansible/kayobe-ansible-user.yml
+++ b/ansible/kayobe-ansible-user.yml
@@ -17,6 +17,7 @@
         module: command ssh -o BatchMode=yes -p {{ ssh_port }} {{ ssh_user }}@{{ ssh_host }} hostname
       failed_when: false
       changed_when: false
+      check_mode: no
       register: ssh_result
       vars:
         ssh_user: "{{ ansible_user }}"
diff --git a/ansible/roles/disable-glean/tasks/main.yml b/ansible/roles/disable-glean/tasks/main.yml
index 43f129fe42e76b772aaaad25119f3a17dc94aab9..cf66dce7a3009ab5ec2c3dc2f083d15f68e5c2f9 100644
--- a/ansible/roles/disable-glean/tasks/main.yml
+++ b/ansible/roles/disable-glean/tasks/main.yml
@@ -3,6 +3,7 @@
   command: systemctl list-units glean*.service --no-legend --no-pager --state=loaded
   register: glean_services
   changed_when: False
+  check_mode: no
 
 - name: Ensure Glean services are stopped and disabled
   service:
diff --git a/releasenotes/notes/fix-check-mode-c0f8e1fcb09f730b.yaml b/releasenotes/notes/fix-check-mode-c0f8e1fcb09f730b.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..259920ee81613f4a07312a0f664946172d273ab7
--- /dev/null
+++ b/releasenotes/notes/fix-check-mode-c0f8e1fcb09f730b.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes some issues seen when using the ``--check`` argument with ``kayobe
+    overcloud host configure``. See `story 2004798
+    <https://storyboard.openstack.org/#!/story/2004798>`__.