diff --git a/src/apptask.js b/src/apptask.js
index 58bbffefe..6d3a6a019 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -333,6 +333,8 @@ function startContainer(app, callback) {
 
         var startOptions = {
             Binds: addons.getBindsSync(app, app.manifest.addons),
+            Memory: 1024 * 1024 * 100,
+            MemorySwap: 1024 * 1024 * 200, // Memory + Swap
             PortBindings: dockerPortBindings,
             PublishAllPorts: false,
             Links: addons.getLinksSync(app, app.manifest.addons),