diff --git a/.gitignore b/.gitignore
index 7a25766..acac474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules/
 npm-debug.log
 tmp/
 .exosphere
+*.tfvars
diff --git a/docker-compose/run_development.yml b/docker-compose/run_development.yml
index c066fee..8ffe724 100755
--- a/docker-compose/run_development.yml
+++ b/docker-compose/run_development.yml
@@ -23,7 +23,6 @@ services:
     volumes:
     - ${APP_PATH}/tweets-service:/mnt
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-tweets-service
@@ -41,7 +40,6 @@ services:
     volumes:
     - ${APP_PATH}/users-service:/mnt
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-users-service
@@ -53,10 +51,7 @@ services:
     restart: on-failure
   mongo:
     image: mongo:3.4.0
-    volumes:
-    - mongo__data_db:/data/db
     environment:
-      DB_NAME: test-db
       SERVICE_DATA: '{"exosphere-tweets-service":{},"exosphere-users-service":{},"space-tweet-web-service":{}}'
     restart: on-failure
   space-tweet-web-service:
@@ -69,7 +64,6 @@ services:
     volumes:
     - ${APP_PATH}/web-server:/mnt
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: space-tweet-web-service
@@ -77,5 +71,4 @@ services:
     - exocom
     - mongo
     restart: on-failure
-volumes:
-  mongo__data_db: null
+volumes: {}
diff --git a/docker-compose/run_production.yml b/docker-compose/run_production.yml
index b9f4f28..20475ff 100755
--- a/docker-compose/run_production.yml
+++ b/docker-compose/run_production.yml
@@ -20,7 +20,6 @@ services:
       context: ${APP_PATH}/tweets-service
       dockerfile: Dockerfile.prod
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-tweets-service
@@ -35,7 +34,6 @@ services:
       context: ${APP_PATH}/users-service
       dockerfile: Dockerfile.prod
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-users-service
@@ -47,10 +45,7 @@ services:
     restart: on-failure
   mongo:
     image: mongo:3.4.0
-    volumes:
-    - mongo__data_db:/data/db
     environment:
-      DB_NAME: test-db
       SERVICE_DATA: '{"exosphere-tweets-service":{},"exosphere-users-service":{},"space-tweet-web-service":{}}'
     restart: on-failure
   space-tweet-web-service:
@@ -60,7 +55,6 @@ services:
     ports:
     - 3000:3000
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: space-tweet-web-service
@@ -68,5 +62,4 @@ services:
     - exocom
     - mongo
     restart: on-failure
-volumes:
-  mongo__data_db: null
+volumes: {}
diff --git a/docker-compose/test.yml b/docker-compose/test.yml
index bdebbee..bee748a 100755
--- a/docker-compose/test.yml
+++ b/docker-compose/test.yml
@@ -21,7 +21,6 @@ services:
       dockerfile: Dockerfile.dev
     command: /node_modules/.bin/cucumber-js
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-tweets-service
@@ -34,7 +33,6 @@ services:
       dockerfile: Dockerfile.dev
     command: /node_modules/.bin/cucumber-js
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: exosphere-users-service
@@ -43,10 +41,7 @@ services:
     - mongo
   mongo:
     image: mongo:3.4.0
-    volumes:
-    - mongo__data_db:/data/db
     environment:
-      DB_NAME: test-db
       SERVICE_DATA: '{"exosphere-tweets-service":{},"exosphere-users-service":{},"space-tweet-web-service":{}}'
     restart: on-failure
   space-tweet-web-service:
@@ -54,12 +49,10 @@ services:
       context: ${APP_PATH}/web-server
       dockerfile: Dockerfile.dev
     environment:
-      COLLECTION_NAME: test-collection
       EXOCOM_HOST: exocom
       MONGO_HOST: mongo
       ROLE: space-tweet-web-service
     depends_on:
     - exocom
     - mongo
-volumes:
-  mongo__data_db: null
+volumes: {}
diff --git a/terraform/main.tf b/terraform/main.tf
index ddbef5a..eed1c3e 100755
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -34,7 +34,7 @@ variable "key_name" {
 }
 
 module "aws" {
-  source = "github.com/Originate/exosphere.git//terraform//aws?ref=30894145"
+  source = "github.com/Originate/exosphere.git//terraform//aws?ref=b0241967"
 
   name              = "space-tweet"
   env               = "${var.env}"
@@ -50,7 +50,7 @@ variable "exosphere-tweets-service_env_vars" {
 variable "exosphere-tweets-service_docker_image" {}
 
 module "exosphere-tweets-service" {
-  source = "github.com/Originate/exosphere.git//terraform//aws//worker-service?ref=30894145"
+  source = "github.com/Originate/exosphere.git//terraform//aws//worker-service?ref=b0241967"
 
   name = "exosphere-tweets-service"
 
@@ -71,7 +71,7 @@ variable "exosphere-users-service_env_vars" {
 variable "exosphere-users-service_docker_image" {}
 
 module "exosphere-users-service" {
-  source = "github.com/Originate/exosphere.git//terraform//aws//worker-service?ref=30894145"
+  source = "github.com/Originate/exosphere.git//terraform//aws//worker-service?ref=b0241967"
 
   name = "exosphere-users-service"
 
@@ -94,7 +94,7 @@ variable "space-tweet-web-service_docker_image" {}
 variable "space-tweet-web-service_url" {}
 
 module "space-tweet-web-service" {
-  source = "github.com/Originate/exosphere.git//terraform//aws//public-service?ref=30894145"
+  source = "github.com/Originate/exosphere.git//terraform//aws//public-service?ref=b0241967"
 
   name = "space-tweet-web-service"
 
@@ -121,7 +121,7 @@ module "space-tweet-web-service" {
 }
 
 module "exocom_cluster" {
-  source = "github.com/Originate/exosphere.git//remote-dependency-templates//exocom//modules//exocom-cluster?ref=30894145"
+  source = "github.com/Originate/exosphere.git//remote-dependency-templates//exocom//modules//exocom-cluster?ref=b0241967"
 
   availability_zones      = "${module.aws.availability_zones}"
   env                     = "${var.env}"
@@ -146,7 +146,7 @@ variable "exocom_env_vars" {
 }
 
 module "exocom_service" {
-  source = "github.com/Originate/exosphere.git//remote-dependency-templates//exocom//modules//exocom-service?ref=30894145"
+  source = "github.com/Originate/exosphere.git//remote-dependency-templates//exocom//modules//exocom-service?ref=b0241967"
 
   cluster_id            = "${module.exocom_cluster.cluster_id}"
   cpu_units             = "128"
diff --git a/users-service/Dockerfile.prod b/users-service/Dockerfile.prod
index 1239309..0116b4d 100644
--- a/users-service/Dockerfile.prod
+++ b/users-service/Dockerfile.prod
@@ -7,4 +7,4 @@ ENV PATH="/node_modules/.bin:${PATH}"
 
 COPY . .
 
-CMD ["lsc", "src/server.ls"]
+CMD ["bin/start"]
diff --git a/users-service/bin/start b/users-service/bin/start
new file mode 100755
index 0000000..fce909b
--- /dev/null
+++ b/users-service/bin/start
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+
+update-route53 $ROLE $INTERNAL_HOSTED_ZONE_NAME
+lsc src/server.ls
diff --git a/users-service/bin/update-route53 b/users-service/bin/update-route53
new file mode 100755
index 0000000..e517f1b
Binary files /dev/null and b/users-service/bin/update-route53 differ
diff --git a/users-service/service.yml b/users-service/service.yml
index 6891186..ebf7211 100644
--- a/users-service/service.yml
+++ b/users-service/service.yml
@@ -28,6 +28,10 @@ development:
 remote:
   cpu: 100
   memory: 500
-  secrets:
-    - MONGODB_USER
-    - MONGODB_PW
+  environments:
+    production:
+      environment-variables:
+        INTERNAL_HOSTED_ZONE_NAME: production-space-tweet.local
+      secrets:
+        - MONGODB_USER
+        - MONGODB_PW