diff --git a/src/infra_version.js b/src/infra_version.js
index 53a33de26..32d251919 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -14,9 +14,9 @@ exports = module.exports = {
     // Note that if any of the databases include an upgrade, bump the infra version above
     // This is because we upgrade using dumps instead of mysql_upgrade, pg_upgrade etc
     'images': {
-        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:0.16.0' },
-        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.16.0' },
-        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.12.0' },
+        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:0.17.0' },
+        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.0' },
+        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
         'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.31.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.11.0' }
diff --git a/src/platform.js b/src/platform.js
index c2f0fb3be..44088fc4a 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -84,14 +84,14 @@ function stop(callback) {
 }
 
 function emitPlatformReady() {
-    // give 30 seconds for the platform to "settle". For example, mysql might still be initing the
+    // give some time for the platform to "settle". For example, mysql might still be initing the
     // database dir and we cannot call service scripts until that's done.
-    // TODO: make this smarter to not wait for 30secs for the crash-restart case
+    // TODO: make this smarter to not wait for 15secs for the crash-restart case
     gPlatformReadyTimer = setTimeout(function () {
         debug('emitting platform ready');
         gPlatformReadyTimer = null;
         taskmanager.resumeTasks();
-    }, 30000);
+    }, 15000);
 }
 
 function removeOldImages(callback) {
@@ -177,7 +177,7 @@ function startMysql(callback) {
 
     shell.execSync('startMysql', cmd);
 
-    callback();
+    setTimeout(callback, 5000);
 }
 
 function startPostgresql(callback) {
@@ -203,7 +203,7 @@ function startPostgresql(callback) {
 
     shell.execSync('startPostgresql', cmd);
 
-    callback();
+    setTimeout(callback, 5000);
 }
 
 function startMongodb(callback) {
@@ -229,7 +229,7 @@ function startMongodb(callback) {
 
     shell.execSync('startMongodb', cmd);
 
-    callback();
+    setTimeout(callback, 5000);
 }
 
 function createMailConfig(callback) {