diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 34bc3c580c..582395a111 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -227,6 +227,7 @@ resources:
                         name: <%pool%>
                         pg_num: {get_param: CephPoolDefaultPgNum}
                         rule_name: ""
+                        application: rbd
                       for_each:
                         <%pool%>:
                           list_concat_unique:
@@ -234,9 +235,15 @@ resources:
                               - {get_param: CinderBackupRbdPoolName}
                               - {get_param: NovaRbdPoolName}
                               - {get_param: GlanceRbdPoolName}
-                              - {get_param: GnocchiRbdPoolName}
                             # CinderRbdExtraPools is a list (do not indent further)
                             - {get_param: CinderRbdExtraPools}
+                  - if:
+                    - equals: [{get_param: GnocchiRbdPoolName}, '']
+                    - []
+                    - - name: {get_param: GnocchiRbdPoolName}
+                        pg_num: {get_param: CephPoolDefaultPgNum}
+                        rule_name: ""
+                        application: openstack_gnocchi
                   - {get_param: CephPools}
           openstack_keys: &openstack_keys
           - name:
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml
index 1aa10c23f3..7f07b95330 100644
--- a/environments/disable-telemetry.yaml
+++ b/environments/disable-telemetry.yaml
@@ -18,3 +18,4 @@ resource_registry:
 
 parameter_defaults:
   NotificationDriver: 'noop'
+  GnocchiRbdPoolName: ''