diff --git a/ceph/mon.sls b/ceph/mon.sls
index 67e18c9..b660cdf 100644
--- a/ceph/mon.sls
+++ b/ceph/mon.sls
@@ -54,13 +54,7 @@
     - pkg: mon_packages
     - file: common_config
 
-# PROD-34765
-salt_minion_ceph_grains_publish:
-  module.wait:
-  - name: mine.update
-  - watch:
-    - cmd: populate_monmap
-
+{%- if common.keyring.admin is not defined %}
 /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring:
   file.managed:
   - source: salt://ceph/files/mon_keyring
@@ -69,6 +63,7 @@
   - unless: "test -f /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/done"
   - require:
     - pkg: mon_packages
+{%- endif %}
 
 /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/done:
   file.managed: