diff --git a/src/addons.js b/src/addons.js
index 3945c4c70..e896e438f 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -812,7 +812,9 @@ function updateServiceConfig(platformConfig, callback) {
         }
 
         const args = `update --memory ${memory} --memory-swap ${memorySwap} ${serviceName}`.split(' ');
-        shell.spawn(`updateServiceConfig(${serviceName})`, '/usr/bin/docker', args, { }, iteratorCallback);
+        async.retry({ times: 10, interval: 60 * 1000 }, function (retryCallback) {
+            shell.spawn(`updateServiceConfig(${serviceName})`, '/usr/bin/docker', args, { }, retryCallback);
+        }, iteratorCallback);
     }, callback);
 }
 
diff --git a/src/settings.js b/src/settings.js
index 5e9ae5015..c099189d9 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -450,7 +450,9 @@ function setPlatformConfig(platformConfig, callback) {
     settingsdb.set(exports.PLATFORM_CONFIG_KEY, JSON.stringify(platformConfig), function (error) {
         if (error) return callback(error);
 
-        addons.updateServiceConfig(platformConfig, callback);
+        callback(null); // updating service config can take a while
+
+        addons.updateServiceConfig(platformConfig);
     });
 }