diff --git a/ceph/files/backup/ceph-backup-client-runner.sh b/ceph/files/backup/ceph-backup-client-runner.sh
index ca7ba6c..d2601eb 100644
--- a/ceph/files/backup/ceph-backup-client-runner.sh
+++ b/ceph/files/backup/ceph-backup-client-runner.sh
@@ -1,4 +1,4 @@
-{%- from "ceph/map.jinja" import backup with context -%}
+{%- from "ceph/map.jinja" import backup, mon, osd with context -%}
 #!/bin/bash
 # Script to backup ceph schema and create snapshot of keyspaces
 
@@ -40,10 +40,15 @@
 
     mkdir -p "$BACKUPDIR/$HOSTNAME/"
 
+{%- if osd.get('enabled', False) %}
+    cp -a /etc/ceph/ $TMPDIR/
+    cp -a /var/lib/ceph/ $TMPDIR/ceph-$HOSTNAME/
+{%- elif mon.get('enabled', False) %}
     cp -a /etc/ceph/ $TMPDIR/
     service ceph-mon@$HOSTNAME stop
     cp -a /var/lib/ceph/ $TMPDIR/ceph-$HOSTNAME/
     service ceph-mon@$HOSTNAME start
+{%- endif %}
 
     tar -cvzf $BACKUPDIR/$HOSTNAME/ceph-$HOSTNAME-$TIMESTAMP.tgz $TMPDIR
     RC=$?
diff --git a/ceph/map.jinja b/ceph/map.jinja
index 1b9e559..4873230 100644
--- a/ceph/map.jinja
+++ b/ceph/map.jinja
@@ -96,12 +96,12 @@
   Debian:
     pkgs:
     - rsync
-    backup_dir: '/var/backups/ceph-mon'
+    backup_dir: '/var/backups/ceph'
     cron: True
   RedHat:
     pkgs:
     - rsync
-    backup_dir: '/var/backups/ceph-mon'
+    backup_dir: '/var/backups/ceph'
     cron: True
 
 {%- endload %}