diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 0ffa8e6..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=gerrit.mcp.mirantis.net
-port=29418
-project=salt-formulas/ceph.git
diff --git a/ceph/backup.sls b/ceph/backup.sls
index 2de94d6..e08a679 100644
--- a/ceph/backup.sls
+++ b/ceph/backup.sls
@@ -106,6 +106,14 @@
     - user: ceph_user
     - pkg: ceph_backup_server_packages
 
+{{ backup.backup_dir }}/.ssh:
+  file.directory:
+  - mode: 700
+  - user: ceph
+  - group: ceph
+  - require:
+    - user: ceph_user
+
 {{ backup.backup_dir }}/.ssh/authorized_keys:
   file.managed:
   - user: ceph
@@ -114,6 +122,7 @@
   - source: salt://ceph/files/backup/authorized_keys
   - require:
     - file: {{ backup.backup_dir }}/full
+    - file: {{ backup.backup_dir }}/.ssh
 
 ceph_server_script:
   file.managed:
diff --git a/ceph/files/backup/ceph-backup-client-runner-call.sh b/ceph/files/backup/ceph-backup-client-runner-call.sh
index 6c13525..51a0d8d 100644
--- a/ceph/files/backup/ceph-backup-client-runner-call.sh
+++ b/ceph/files/backup/ceph-backup-client-runner-call.sh
@@ -19,7 +19,7 @@
 # Configuration
 # -------------
     BACKUPDIR="{{ backup.backup_dir }}/full"
-    SERVERBACKUPDIR="{{ backup.client.target.get('backup_dir', backup.backup_dir) }}"
+    SERVERBACKUPDIR="{{ backup.client.target.get('backup_dir', backup.backup_dir) }}/full"
     TMPDIR="$( pwd )/tmp_ceph_backup"
     HOSTNAME="$( hostname )"
     TIMESTAMP="$( date +%m%d%k%M )"
@@ -109,4 +109,4 @@
 else
     echo "----------------------------"
     echo "-s parameter passed. Cleanup was not triggered"
-fi
\ No newline at end of file
+fi