diff --git a/app/private/common/config.php b/app/private/common/config.php
index ac9c40c..717ee5c 100644
--- a/app/private/common/config.php
+++ b/app/private/common/config.php
@@ -134,7 +134,7 @@ $config->database = $database;
 
 $config->mailer = new stdClass();
 $config->mailer->address = "email-smtp.eu-west-1.amazonaws.com";
-$config->mailer->port = "25";
+$config->mailer->port = "587";
 $config->mailer->username = "AKIASMB7IW2MQPUP5CXS";
 $config->mailer->password = "BHv+82Nns1kIKg99Hx0sjKlEpR+X4+1EgX+ec64n/mBt";
 $config->mailer->smtpAuth = true;
diff --git a/cicd/cron/backup b/cicd/cron/backup
index 6b4fdb2..0150e7d 100755
--- a/cicd/cron/backup
+++ b/cicd/cron/backup
@@ -4,10 +4,21 @@ DATE=`date +"%Y-%m-%d_%H:%M"`
 
 echo "Generating backup $DATE"
 
-mongodump --host fdn2.production.database -d fdn2 --port 27017 --out "/backups/mongodump-$DATE"
+DATABASE_HOST="fdn2.production.database"
+DATABASE_NAME="fdn2"
+DATABASE_PORT="27017"
+WORKDIR="/workdir"
+STORAGE="/backups"
 
-for old in `ls -t /backups | tail -n +7`; do
-    TOREMOVE="/backups/$old"
+mkdir -p $WORKDIR
+
+mongodump --host $DATABASE_HOST -d $DATABASE_NAME --port $DATABASE_PORT --out "$WORKDIR"
+
+tar -cvzf "$STORAGE/dump-$DATE.tar.gz" "$WORKDIR"
+
+for old in `ls -t $STORAGE | tail -n +7`; do
+    TOREMOVE="$STORAGE/$old"
     echo "Removing '$TOREMOVE'";
     rm -r $TOREMOVE
-done
\ No newline at end of file
+done
+