diff --git a/.gitignore b/.gitignore
index 06aab12..f14bddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,4 @@ data/
 dist
 _build/.cache
 
-.env.json
+.env*
diff --git a/config/default.json b/config/default.json
index 729c13b..198e1f3 100644
--- a/config/default.json
+++ b/config/default.json
@@ -5,16 +5,16 @@
     "url": "DATABASE_URL"
   },
   "pubsub": {
-    "id": "bab60de7",
-    "key": "0nabkCiVoCSxErMPhdsIFQ=="
+    "id": "PUBSUB_ID",
+    "key": "PUBSUB_KEY"
   },
   "email": {
-    "key": "5pwwJkeIFIVKMbYct3CT2A",
-    "from": "noreply@pingeon.com"
+    "key": "EMAIL_KEY",
+    "from": "EMAIL_FROM"
   },
   "push": {
-    "key": "AKIAJW2SSA6LPZV3NZLA",
-    "secret": "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",
+    "key": "PUSH_KEY",
+    "secret": "PUSH_SECRET",
     "region": "us-east-1",
     "title": "Outfit",
     "appsArns": {
diff --git a/test/aws-utils.test.js b/test/aws-utils.test.js
index 5b1ddda..ef00651 100644
--- a/test/aws-utils.test.js
+++ b/test/aws-utils.test.js
@@ -8,11 +8,11 @@ describe('AWS utils', () => {
 
     const arn = 'arn:aws:sns:us-east-1:093525834944:app/APNS_SANDBOX/outfit-development';
     const logGroup = 'sns/us-east-1/093525834944/app/APNS_SANDBOX/outfit-development';
-    
+
     it('should generate right log group', () => {
       assert.deepEqual(awsUtils.getLogGroup(arn), logGroup);
     });
 
   });
-  
+
 });
diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml
index 2faf3dc..5e716b4 100644
--- a/test/docker/docker-compose.yml
+++ b/test/docker/docker-compose.yml
@@ -1,6 +1,7 @@
 version: '2'
 services:
   app:
+    container_name: app
     build:
       context: ../../
       dockerfile: ./test/docker/Dockerfile
@@ -10,5 +11,3 @@ services:
       DATABASE_URL: "mongodb://mongo:27017/pingeon"
   mongo:
     image: "mvertes/alpine-mongo"
-    logging:
-      driver: none
diff --git a/test/docker/run-tests.sh b/test/docker/run-tests.sh
index 52fa47e..ee81880 100755
--- a/test/docker/run-tests.sh
+++ b/test/docker/run-tests.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
 
-# If script wasn't run in Jenkins set default tag
-if [ -z "$BUILD_TAG" ]
-then
-  BUILD_TAG="test-1"
-fi
-
-# Prepare project and container names for proper status check
-PROJECT=`echo $BUILD_TAG | sed "s/\-//g"`
-CONTAINER=$PROJECT"_app_1"
+set -e
 
 # Build environment and run ci scripts
-docker-compose -f test/docker/docker-compose.yml -p $PROJECT up --abort-on-container-exit --build
+docker-compose -f test/docker/docker-compose.yml up -d --build
+
+# See the output from the scripts
+docker attach app
 
-# Status check
-exit $(docker wait $CONTAINER)
+# Clean everything up
+docker-compose -f test/docker/docker-compose.yml kill
+docker-compose -f test/docker/docker-compose.yml rm -f