diff --git a/Dockerfile b/Dockerfile
index 76b87f3..f4f2527 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,12 @@ ENV STORAGE_TYPE=memcached \
     STORAGE_PORT=11211\
     STORAGE_EXPIRE_SECONDS=2592000\
     STORAGE_DB=2 \
-    STORAGE_CONNECTION_URL= \
     STORAGE_AWS_BUCKET= \
     STORAGE_AWS_REGION= \
     STORAGE_PG_PASSWORD= \
-    STORAGE_PG_USERNAME= 
+    STORAGE_PG_USERNAME= \
+    STORAGE_RETHINK_USER= \
+    STORAGE_RETHINK_PASSWORD= 
 
 ENV LOGGING_LEVEL=verbose \
     LOGGING_TYPE=Console \
diff --git a/docker-entrypoint.js b/docker-entrypoint.js
index e9e7ead..d661fbf 100644
--- a/docker-entrypoint.js
+++ b/docker-entrypoint.js
@@ -14,6 +14,8 @@ const {
   STORAGE_AWS_REGION,
   STORAGE_PG_PASSWORD,
   STORAGE_PG_USERNAME,
+  STORAGE_RETHINK_USER,
+  STORAGE_RETHINK_PASSWORD,
   LOGGING_LEVEL,
   LOGGING_TYPE,
   LOGGING_COLORIZE,
@@ -91,6 +93,8 @@ const config = {
     region: STORAGE_AWS_REGION,
     connectionUrl: `postgres://${STORAGE_PG_USERNAME}:${STORAGE_PG_PASSWORD}@${STORAGE_HOST}:${STORAGE_PORT}/${STORAGE_DB}`,
     db: STORAGE_DB,
+    user: STORAGE_RETHINK_USER,
+    password: STORAGE_RETHINK_USER,
   },
 
   documents: DOCUMENTS