diff --git a/app.py b/app.py
index aadbb88..815b88c 100644
--- a/app.py
+++ b/app.py
@@ -1,12 +1,16 @@
+import os
 from flask import Flask, render_template, jsonify
 from rethinkdb import RethinkDB
 from routes.conditions import create_conditions_routes
 
+rethinkUrl = os.environ.get('RETHINKDB_URL')
+rethinkPort = os.environ.get('RETHINKDB_PORT')
+
 app = Flask(__name__)
 
 # Connect to RethinkDB
 r = RethinkDB()
-conn = r.connect('alice', 40002, db='finfree')
+conn = r.connect(rethinkUrl, rethinkPort, db='finfree')
 
 create_conditions_routes(app, r, conn)