diff --git a/Dockerrun.aws.json.production b/Dockerrun.aws.json.production
index 21a69e2..13afa9d 100644
--- a/Dockerrun.aws.json.production
+++ b/Dockerrun.aws.json.production
@@ -1,13 +1,5 @@
 {
   "AWSEBDockerrunVersion": 2,
-  "volumes": [
-    {
-      "name": "log-socket",
-      "host": {
-        "sourcePath": "/var/run/docker.sock"
-      }
-    }
-  ],
   "containerDefinitions": [
     {
       "name": "proxy",
@@ -27,6 +19,15 @@
         }
       ],
       "links": ["server"]
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": true,
+          "awslogs-group": "production",
+          "awslogs-region": "eu-central-1",
+          "awslogs-stream-prefix": "proxy"
+        }
+      }
     },
     {
       "name": "server",
@@ -36,7 +37,16 @@
       "command": ["serve"],
       "environment": [
         { "name": "OFFEN_SERVER_REVERSEPROXY", "value": "1" }
-      ]
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": true,
+          "awslogs-group": "production",
+          "awslogs-region": "eu-central-1",
+          "awslogs-stream-prefix": "server"
+        }
+      }
     }
   ]
 }
diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging
index 729b0ec..2125921 100644
--- a/Dockerrun.aws.json.staging
+++ b/Dockerrun.aws.json.staging
@@ -19,7 +19,16 @@
           "condition": "START"
         }
       ],
-      "links": ["server"]
+      "links": ["server"],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": true,
+          "awslogs-group": "staging",
+          "awslogs-region": "eu-central-1",
+          "awslogs-stream-prefix": "proxy"
+        }
+      }
     },
     {
       "name": "server",
@@ -29,7 +38,16 @@
       "command": ["serve"],
       "environment": [
         { "name": "OFFEN_SERVER_REVERSEPROXY", "value": "1" }
-      ]
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": true,
+          "awslogs-group": "staging",
+          "awslogs-region": "eu-central-1",
+          "awslogs-stream-prefix": "server"
+        }
+      }
     }
   ]
 }