diff --git a/deploy/docker-compose/README.md b/deploy/docker-compose/README.md
index 9eb37d0..652fecf 100644
--- a/deploy/docker-compose/README.md
+++ b/deploy/docker-compose/README.md
@@ -144,7 +144,7 @@ Content-Length: 231
 Read a single parameter:
 
 ```
-curl -i -H "Authorization: Basic dXNlcjpwYXNz" "http://localhost:6100/api/v2/device/mac:112233445566/config?names=Device.DeviceInfo.X_CISCO_COM_BootloaderVersion"
+curl -i -H "Authorization: Basic dXNlcjpwYXNz" "http://localhost:6100/api/v2/device/mac:112233445566/config?names=Device.DeviceInfo.X_CISCO_COM_BootloaderVersion" -H "X-Xmidt-Partner-ID: comcast,nbc,sky"
 ```
 
 Results in:
diff --git a/deploy/docker-compose/deploy.sh b/deploy/docker-compose/deploy.sh
index 74fe2ea..2519574 100755
--- a/deploy/docker-compose/deploy.sh
+++ b/deploy/docker-compose/deploy.sh
@@ -16,12 +16,12 @@ docker build -t goaws:local .
 popd
 
 echo "Running services..."
-CADUCEUS_VERSION=${CADUCEUS_VERSION:-0.2.1} \
-TR1D1UM_VERSION=${TR1D1UM_VERSION:-0.1.5} \
+CADUCEUS_VERSION=${CADUCEUS_VERSION:-0.2.7} \
+TR1D1UM_VERSION=${TR1D1UM_VERSION:-0.5.0} \
 SCYTALE_VERSION=${SCYTALE_VERSION:-0.1.5} \
 PETASOS_VERSION=${PETASOS_VERSION:-0.1.4} \
-TALARIA_VERSION=${TALARIA_VERSION:-0.1.3} \
-THEMIS_VERSION=${THEMIS_VERSION:-0.4.0} \
+TALARIA_VERSION=${TALARIA_VERSION:-0.5.1} \
+THEMIS_VERSION=${THEMIS_VERSION:-0.4.3} \
 SIMULATOR_VERSION=${SIMULATOR_VERSION:-local} \
 docker-compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@
 
diff --git a/deploy/docker-compose/docFiles/caduceus.yaml b/deploy/docker-compose/docFiles/caduceus.yaml
index 93c0c2f..177b9cc 100644
--- a/deploy/docker-compose/docFiles/caduceus.yaml
+++ b/deploy/docker-compose/docFiles/caduceus.yaml
@@ -18,7 +18,7 @@
   log:
     file: "stdout"
     level: "DEBUG"
-    json: false
+    json: true
   env: test
   fqdn: caduceus
   scheme: http
@@ -76,8 +76,6 @@
           id: "caduceus"
           name: "caduceus"
           tags:
-            - "dev"
-            - "docker"
             - "stage=dev"
             - "flavor=docker"
           address: "http://caduceus"
diff --git a/deploy/docker-compose/docFiles/scytale.yaml b/deploy/docker-compose/docFiles/scytale.yaml
index 7333d38..59196d2 100644
--- a/deploy/docker-compose/docFiles/scytale.yaml
+++ b/deploy/docker-compose/docFiles/scytale.yaml
@@ -23,7 +23,7 @@
   log:
     file: "stdout"
     level: "DEBUG"
-    json: false
+    json: true
 
   fanout:
     endpoints: [ "http://petasos:6400/api/v2/device/send" ]
@@ -52,8 +52,6 @@
           id: "scytale"
           name: "scytale"
           tags:
-            - "dev"
-            - "docker"
             - "stage=dev"
             - "flavor=docker"
           address: "http://scytale"
diff --git a/deploy/docker-compose/docFiles/talaria-0.yaml b/deploy/docker-compose/docFiles/talaria-0.yaml
index 5ed753c..015f8b5 100644
--- a/deploy/docker-compose/docFiles/talaria-0.yaml
+++ b/deploy/docker-compose/docFiles/talaria-0.yaml
@@ -20,7 +20,7 @@
   log:
     file: "stdout"
     level: "debug"
-    json: false
+    json: true
 
   device:
     manager:
@@ -31,6 +31,9 @@
       pingPeriod: "45s"
       idlePeriod: "135s"
       requestTimeout: "15s"
+    rehasher:
+      services:
+        - talaria  
     outbound:
       method: "POST"
       eventEndpoints:
@@ -54,13 +57,27 @@
   eventMap:
     default: http://caduceus:6000/api/v3/notify
 
-  jwtValidators:
-    -
-      keys:
-        Factory:
-            uri: "http://themis:6500/keys/{keyId}"
-        purpose: 0
-        updateInterval: 604800000000000
+  jwtValidator:
+    keys:
+      Factory:
+          uri: "http://themis:6500/keys/{keyId}"
+      purpose: 0
+      updateInterval: 24h 
+  
+  deviceAccessCheck:
+    type: monitor
+    checks:
+      - 
+        name: PartnerID
+        deviceCredentialPath: partner-id
+        op: contains
+        wrpCredentialPath: PartnerIDs
+        inversed: true
+      - 
+        name: Trusted Device
+        deviceCredentialPath: trust
+        op: "gt"
+        inputValue: 999
 
   service:
     defaultScheme: http
@@ -75,22 +92,21 @@
         -
           service: "talaria"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
         -
           service: "caduceus"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
+
       registrations:
         -
           id: "talaria-0"
           name: "talaria"
           tags:
-            - "dev"
-            - "docker"
             - "stage=dev"
             - "flavor=docker"
           address: "http://talaria-0"
diff --git a/deploy/docker-compose/docFiles/talaria-1.yaml b/deploy/docker-compose/docFiles/talaria-1.yaml
index c6430de..23a2b74 100644
--- a/deploy/docker-compose/docFiles/talaria-1.yaml
+++ b/deploy/docker-compose/docFiles/talaria-1.yaml
@@ -20,7 +20,7 @@
   log:
     file: "stdout"
     level: "debug"
-    json: false
+    json: true
 
   device:
     manager:
@@ -31,6 +31,11 @@
       pingPeriod: "45s"
       idlePeriod: "135s"
       requestTimeout: "15s"
+
+    rehasher:
+      services:
+        - talaria
+
     outbound:
       method: "POST"
       eventEndpoints:
@@ -54,13 +59,27 @@
   eventMap:
     default: http://caduceus:6000/api/v3/notify
 
-  jwtValidators:
-    -
-      keys:
-        Factory:
-            uri: "http://themis:6500/keys/{keyId}"
-        purpose: 0
-        updateInterval: 604800000000000
+  jwtValidator:
+    keys:
+      Factory:
+          uri: "http://themis:6500/keys/{keyId}"
+      purpose: 0
+      updateInterval: 24h
+  
+  deviceAccessCheck:
+    type: monitor
+    checks:
+      - 
+        name: PartnerID
+        deviceCredentialPath: partner-id
+        op: contains
+        wrpCredentialPath: PartnerIDs
+        inversed: true
+      - 
+        name: Trusted Device
+        deviceCredentialPath: trust
+        op: "gt" 
+        inputValue: 999
 
   service:
     defaultScheme: http
@@ -75,22 +94,20 @@
         -
           service: "talaria"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
         -
           service: "caduceus"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
       registrations:
         -
           id: "talaria-1"
           name: "talaria"
           tags:
-            - "dev"
-            - "docker"
             - "stage=dev"
             - "flavor=docker"
           address: "http://talaria-1"
diff --git a/deploy/docker-compose/docFiles/talaria-2.yaml b/deploy/docker-compose/docFiles/talaria-2.yaml
index 7bb99ad..4a3ec51 100644
--- a/deploy/docker-compose/docFiles/talaria-2.yaml
+++ b/deploy/docker-compose/docFiles/talaria-2.yaml
@@ -31,6 +31,11 @@
       pingPeriod: "45s"
       idlePeriod: "135s"
       requestTimeout: "15s"
+
+    rehasher:
+      services:
+        - talaria
+
     outbound:
       method: "POST"
       eventEndpoints:
@@ -54,13 +59,27 @@
   eventMap:
     default: http://caduceus:6000/api/v3/notify
 
-  jwtValidators:
-    -
-      keys:
-        Factory:
-            uri: "http://themis:6500/keys/{keyId}"
-        purpose: 0
-        updateInterval: 604800000000000
+  jwtValidator:
+    keys:
+      Factory:
+          uri: "http://themis:6500/keys/{keyId}"
+      purpose: 0
+      updateInterval: 24h
+
+  deviceAccessCheck:
+    type: monitor
+    checks:
+      - 
+        name: PartnerID
+        deviceCredentialPath: partner-id
+        op: contains
+        wrpCredentialPath: PartnerIDs
+        inversed: true
+      - 
+        name: Trusted Device
+        deviceCredentialPath: trust
+        op: "gt" 
+        inputValue: 999
 
   service:
     defaultScheme: http
@@ -75,22 +94,20 @@
         -
           service: "talaria"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
         -
           service: "caduceus"
           tags:
-            - "dev"
-            - "docker"
+            - "stage=dev"
+            - "flavor=docker"
           passingOnly: true
       registrations:
         -
           id: "talaria-2"
           name: "talaria"
           tags:
-            - "dev"
-            - "docker"
             - "stage=dev"
             - "flavor=docker"
           address: "http://talaria-2"
diff --git a/deploy/docker-compose/docFiles/themis.yaml b/deploy/docker-compose/docFiles/themis.yaml
index 78bdb4c..a81b4c5 100644
--- a/deploy/docker-compose/docFiles/themis.yaml
+++ b/deploy/docker-compose/docFiles/themis.yaml
@@ -31,11 +31,18 @@
         value: "themis"
       trust:
         value: 1000
-      partner-id: 
-        value: "comcast"
       capabilities:
         value:
           - xmidt:issuer:test:.*:all
+      sub:
+        value: client:supplied
+    
+    partnerID:
+      claim: partner-id
+      header: X-Midt-Partner-ID
+      parameter: pid
+      default: comcast
+
     key:
       kid: local
       type: rsa
diff --git a/deploy/docker-compose/docFiles/tr1d1um.yaml b/deploy/docker-compose/docFiles/tr1d1um.yaml
index cc7a76d..df2a93d 100644
--- a/deploy/docker-compose/docFiles/tr1d1um.yaml
+++ b/deploy/docker-compose/docFiles/tr1d1um.yaml
@@ -30,6 +30,7 @@
     file: "stdout"
     level: "INFO"
     json: false
+    reducedLoggingResponseCodes: [200, 504]
     
   webhooksEnabled: false
 
@@ -51,7 +52,7 @@
 
   authHeader: ["dXNlcjpwYXNz"]
   targetURL: http://scytale:6300
-  # WRPSource: "dns:tr1d1um.xmidt.comcast.net"
+  WRPSource: "dns:tr1d1um.example.net"
   supportedServices:
     - "config"
   clientTimeout: "135s"