diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5229ac4..11aa9a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,15 +44,9 @@ jobs:
           key: yarn-packages-v2{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules
+            
   database:
     docker:
-      - image: circleci/node:12
-        environment:
-          DATABASE_URL: postgres://psqluer:psqlpassword@localhost:5432/psdb
-          JWT_SECRET: some string yo want
-          API_PORT: 3000
-          API_HOST: localhost
-          API_PROTOCOL: http
       - image: circleci/postgres:9.6.2-alpine
         environment:
           POSTGRES_USER: psqluser
@@ -63,7 +57,13 @@ jobs:
       - restore_cache:
           name: restore yarn package cache
           key: yarn-packages-v2{{ checksum "yarn.lock" }}
-      - run: yarn test:e2e
+      - 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" }}