diff --git a/src/daemon/config.static.sh b/src/daemon/config.static.sh
index 81fc95f41..10c04d6b5 100755
--- a/src/daemon/config.static.sh
+++ b/src/daemon/config.static.sh
@@ -76,7 +76,7 @@ ENDHERE
   fi
 
   # Apply proper permissions to the keys
-  chown "${CHOWN_OPT[@]}" ceph. "$MON_KEYRING"
+  chown "${CHOWN_OPT[@]}" ceph. "$MON_KEYRING" "$ADMIN_KEYRING"
 
   if [ ! -e "$MONMAP" ]; then
     if [ -e /etc/ceph/monmap ]; then
diff --git a/src/daemon/demo.sh b/src/daemon/demo.sh
index 0b54c5018..99f0c3e11 100755
--- a/src/daemon/demo.sh
+++ b/src/daemon/demo.sh
@@ -58,19 +58,6 @@ if [[ "$RGW_FRONTEND_TYPE" == "beast" ]]; then
 fi
 
 
-function fetch_initial_keys {
-  # This is only valid starting from nautilus
-  if [[ "$CEPH_VERSION" == "luminous" || "$CEPH_VERSION" == "mimic" ]]; then
-      return
-  fi
-
-  for keyring in /var/lib/ceph/mon/*/keyring; do
-    for key in $(ceph -n mon. -k "$keyring"  auth list |& grep ^client); do
-      ceph -n mon. -k "$keyring" auth get "$key" -o "$key"
-    done
-  done
-}
-
 #######
 # MON #
 #######
@@ -80,7 +67,6 @@ function bootstrap_mon {
   start_mon
 
   chown --verbose ceph. /etc/ceph/*
-  fetch_initial_keys
 }