diff --git a/config/database.yml b/config/database.yml
index 2e5ae43..7b21519 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -2,10 +2,10 @@ defaults: &defaults
   adapter: postgresql
   encoding: unicode
   pool: 20
-  host: <%= ENV.fetch('DB_1_PORT_5432_TCP_ADDR', 'localhost') %>
-  port: <%= ENV.fetch('DB_1_PORT_5432_TCP_PORT', '5432') %>
+  host: <%= ENV['DB_PORT_5432_TCP_ADDR'] %>
+  port: <%= ENV['DB_PORT_5432_TCP_PORT'] %>
   username: postgres
-  password: 
+  password:
 
 development:
   database: verb_development
diff --git a/fig.yml b/fig.yml
deleted file mode 100644
index e4f5a63..0000000
--- a/fig.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Remember to run ./local-development.sh first to ensure that a data container has been created.
-db:
-  image: postgres
-  environment:
-    PGDATA: /verbdata/development
-  ports:
-    - "127.0.0.1:5432"
-  volumes_from:
-    - verbdata
-web:
-  environment:
-    RAILS_ENV: development
-  build: .
-  command: foreman run bundle exec rails server -p 80
-  volumes:
-    - .:/home/app
-  ports:
-    - "127.0.0.1:3000:80"
-  links:
-    - db
diff --git a/local-development.sh b/local-development.sh
index ba84988..4d43d4d 100755
--- a/local-development.sh
+++ b/local-development.sh
@@ -1,11 +1,16 @@
-echo "Making sure there is a local data directory at $(pwd)/data\n"
+echo "Build the rails app"
+docker build -t jonathanporta/verb-api .
+
+echo "Making sure there is a local data directory at $(pwd)/data"
 mkdir -p "$(pwd)/data"
 
-echo "Creating data container with a volume mapped to $(pwd)/data\n"
-docker run -d -v $(pwd)/data:/verbdata --name verbdata ubuntu echo 'verb data container'
+echo "Creating data container with a volume mapped to $(pwd)/data"
+docker rm -f verb_data
+docker run -d -v $(pwd)/data:/verbdata --name verb_data ubuntu echo 'verb_data container'
 
-echo "Running fig build\n"
-fig build
+echo "Creating database container"
+docker rm -f verb_db
+docker run -e "PGDATA=/verbdata/development" -d --name verb_db --volumes-from verb_data postgres
 
-echo "Running fig up\n"
-fig up
+docker rm -f verb_rails
+docker run -e "RAILS_ENV=development" -d --name verb_rails -v $(pwd):/home/app -p 127.0.0.1:80:80 --link verb_db:db jonathanporta/verb-api