diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5923dd1..bd6d99d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v3-dependencies-{{ checksum "requirements/dev.txt" }}
+            - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
             - v3-dependencies-
             # fallback to using the latest cache if no exact match is found
 
@@ -41,7 +41,7 @@ jobs:
       - save_cache:
           paths:
             - venv
-          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}
+          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
 
 
 
@@ -67,44 +67,54 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v3-dependencies-{{ checksum "requirements/dev.txt" }}
+            - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
             - v3-dependencies-
             # fallback to using the latest cache if no exact match is found
     
       - run:
-          name: install dockerize
-          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-          environment:
-            DOCKERIZE_VERSION: v0.3.0
-      - run:
-          name: Wait for db
-          command: dockerize -wait tcp://localhost:5432 -timeout 1m
-      - run:
-          name: Migrate Database
+          name: bd upgrade 
           command: |
-            export CONDUIT_SECRET='something-really-secret'
-            export FLASK_APP=/home/circleci/repo/autoapp.py
-            export FLASK_DEBUG=1
-            export DATABASE_URL=postgresql://myUsr:somePwd@localhost:5432/postgres
             . venv/bin/activate
+            sleep 1
             flask db upgrade
-            flask db migrate
+          environment:
+            CONDUIT_SECRET: 'something-really-secret'
+            FLASK_APP: /home/circleci/repo/autoapp.py
+            DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr
+            FLASK_DEBUG: 1
+            POSTGRES_USER: postgres
+            POSTGRES_DB: bdtest
+            POSTGRES_PASSWORD: somePwd
+            POSTGRES_PORT: 5432
+
+
+      
 
+      # run tests!
+      # this example uses Django's built-in test-runner
+      # other common Python testing frameworks include pytest and nose
+      # https://pytest.org
+      # https://nose.readthedocs.io
       - run:
           name: run tests
           command: |
             . venv/bin/activate
+            flask db migrate
             flask test
           environment:
             CONDUIT_SECRET: 'something-really-secret'
             FLASK_APP: /home/circleci/repo/autoapp.py
-            FLASK_DEBUG: 1
             DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr
+            FLASK_DEBUG: 1
+            POSTGRES_USER: postgres
+            POSTGRES_DB: bdtest
+            POSTGRES_PASSWORD: somePwd
+            POSTGRES_PORT: 5432
 
       - save_cache:
           paths:
             - venv
-          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}
+          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
 
   back-deploy-heroku:
     docker: