diff --git a/.circleci/config.yml b/.circleci/config.yml
index 774c058..702f256 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,30 +42,20 @@ jobs:
           key: yarn-packages-v2{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules
-  database:
+  test_e2e:
     docker:
-      - image: circleci/postgres:9.6.2-alpine
+      - image: postgres:9.6-jessie
         environment:
           POSTGRES_USER: psqluser
-          POSTGRES_PASSWORD: psqlpassword
           POSTGRES_DB: psdb
-    steps:
-      - checkout
-      - restore_cache:
-          name: restore yarn package cache
-          key: yarn-packages-v2{{ checksum "yarn.lock" }}
-      - run: 
-          command: yarn test:e2e
-          environment:
-            DATABASE_URL: postgres://$POSTGRES_USER@localhost:5432/$POSTGRES_DB
-            API_PORT: 3000
-            API_HOST: localhost
-            API_PROTOCOL: http
-      - save_cache:
-          name: save yarn package cache
-          key: yarn-packages-v2{{ checksum "yarn.lock" }}
-          paths:
-            - ./node_modules 
+        steps:
+          - run: 
+            command: yarn test:e2e
+              environment: 
+                  DATABASE_URL: postgres://psqluser@localhost:5432/psdb
+                  API_PORT: 3000
+                  API_HOST: localhost
+                  API_PROTOCOL: http 
 workflows:
   build_and_test:
     jobs: