diff --git a/apps/OrionContextBroker/config.json b/apps/OrionContextBroker/config.json
index 1f90c83..9c54e0c 100644
--- a/apps/OrionContextBroker/config.json
+++ b/apps/OrionContextBroker/config.json
@@ -18,5 +18,6 @@
     "labels": ["openmtc:sensor_data:temperature", "openmtc:sensor_data:humidity"],
     "interval": 10,
     "orion_host": "http://localhost:1026",
-    "orion_api": "v2"
+    "orion_api": "v2",
+    "accumulate_address": "http://localhost:8080"
 }
diff --git a/apps/OrionContextBroker/docker/configure-orioncontextbroker-and-start b/apps/OrionContextBroker/docker/configure-orioncontextbroker-and-start
index d7b73d3..5327250 100755
--- a/apps/OrionContextBroker/docker/configure-orioncontextbroker-and-start
+++ b/apps/OrionContextBroker/docker/configure-orioncontextbroker-and-start
@@ -10,6 +10,7 @@ ORIGINATOR_PRE=${ORIGINATOR_PRE-"//openmtc.org/in-cse-1"}
 SSL_CRT=${SSL_CRT-"/etc/openmtc/certs/orioncontextbroker.cert.pem"}
 SSL_KEY=${SSL_KEY-"/etc/openmtc/certs/orioncontextbroker.key.pem"}
 SSL_CA=${SSL_CA-"/etc/openmtc/certs/ca-chain.cert.pem"}
+LABELS=${LABELS-'["openmtc:sensor_data"]'}
 ORION_HOST=${ORION_HOST-"http://localhost:1026"}
 ORION_API=${ORION_API-"v2"}
 ACCUMULATE_ADDRESS=${ACCUMULATE_ADDRESS-"http://localhost:8080"}
@@ -46,6 +47,7 @@ JQ_STRING=${JQ_STRING}' |
     .cse_base = "'${CSE_BASE}'" |
     .poas = '${POAS}' |
     .originator_pre = "'${ORIGINATOR_PRE}'" |
+    .labels = '${LABELS}' |
     .orion_host = "'${ORION_HOST}'" |
     .orion_api = "'${ORION_API}'" |
     .accumulate_address = "'${ACCUMULATE_ADDRESS}'" |
diff --git a/apps/OrionContextBroker/etc/conf/config.json.dist b/apps/OrionContextBroker/etc/conf/config.json.dist
index 82f4965..cba9e3a 100644
--- a/apps/OrionContextBroker/etc/conf/config.json.dist
+++ b/apps/OrionContextBroker/etc/conf/config.json.dist
@@ -1,11 +1,11 @@
 {
     "name": "OrionContextBroker",
-    "ep": "http://localhost:8000",
+    "ep": "http://localhost:18000",
     "cse_base": "onem2m",
     "poas": [
         "http://auto:25396"
     ],
-    "originator_pre": "//openmtc.org/mn-cse-1",
+    "originator_pre": "//openmtc.org/in-cse-1",
     "ssl_certs": {
         "cert_file": "/etc/openmtc/certs/orioncontextbroker.cert.pem",
         "key_file": "/etc/openmtc/certs/orioncontextbroker.key.pem",
@@ -18,5 +18,6 @@
     "labels": ["openmtc:sensor_data"],
     "interval": 10,
     "orion_host": "http://localhost:1026",
-    "orion_api": "v2"
+    "orion_api": "v2",
+    "accumulate_address": "http://localhost:8080"
 }
diff --git a/apps/OrionContextBroker/src/orioncontextbroker/__main__.py b/apps/OrionContextBroker/src/orioncontextbroker/__main__.py
index 6fbf255..a68ba4f 100644
--- a/apps/OrionContextBroker/src/orioncontextbroker/__main__.py
+++ b/apps/OrionContextBroker/src/orioncontextbroker/__main__.py
@@ -51,7 +51,7 @@ orion_host = get_value("orion_host", (unicode, str), default_orion_host, args,
 orion_api = get_value("orion_api", (unicode, str), default_orion_api, args,
                       config)
 accumulate_address = get_value("accumulate_address", (unicode, str),
-                              default_accumulate_address, args, config)
+                               default_accumulate_address, args, config)
 
 # start
 app = OrionContextBroker(