diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index e7fbf8e0b0..acfee21d1a 100644
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -171,7 +171,9 @@
   ansible.builtin.import_role:
     name: ceph-facts
     tasks_from: set_radosgw_address.yml
-  when: inventory_hostname in groups.get(rgw_group_name, [])
+  when:
+    - set_radosgw_address | default(true)
+    - inventory_hostname in groups.get(rgw_group_name, [])
 
 - name: Generate Ceph file
   openstack.config_template.config_template:
diff --git a/roles/ceph-container-common/tasks/main.yml b/roles/ceph-container-common/tasks/main.yml
index 371e3436f0..6a36e8b660 100644
--- a/roles/ceph-container-common/tasks/main.yml
+++ b/roles/ceph-container-common/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Generate systemd ceph-mon target file
+- name: Generate systemd ceph target file
   ansible.builtin.copy:
     src: ceph.target
     dest: /etc/systemd/system/ceph.target