diff --git a/Procfile b/Procfile
index 8c99d19e8326532f4177ea23389e55908a1822ae..ff40e1551306a6076323efc15ed0b1101b9b355e 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1,2 @@
-web: gunicorn heliosserver.wsgi:application -b 0.0.0.0:8000
\ No newline at end of file
+web: gunicorn wsgi:application
+worker: python manage.py celeryd -E -B --beat
\ No newline at end of file
diff --git a/runtime.txt b/runtime.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dd6a7de737b6a4eeea28ed6528199d14e0cdd1a4
--- /dev/null
+++ b/runtime.txt
@@ -0,0 +1 @@
+python-2.7.5
diff --git a/settings.py b/settings.py
index 2151c15472872bb54a8aef82b0f60d3142522b02..28f31816af6a47b44d9e50d7f4a8cc43979875ab 100644
--- a/settings.py
+++ b/settings.py
@@ -24,6 +24,11 @@ DATABASES = {
     }
 }
 
+# override if we have an env variable
+if get_from_env('DATABASE_URL', None):
+    import dj_database_url
+    DATABASES['default'] =  dj_database_url.config()
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.