diff --git a/config/fms-core/wtest_actor.conf b/config/fms-core/wtest_actor.conf
index 05dd3a5..9063644 100644
--- a/config/fms-core/wtest_actor.conf
+++ b/config/fms-core/wtest_actor.conf
@@ -7,7 +7,7 @@ play.akka.actor-system = "mkfleet-4g-actor-system"
 
 akka {
   remote.netty.tcp.port=45000
-  remote.netty.tcp.hostname="172.20.24.171"
+  remote.netty.tcp.hostname=172.20.24.171
 
   remote.netty.tcp.bind-port=45000
   remote.netty.tcp.bind-hostname=0.0.0.0
diff --git a/config/fms-core/wtest_core.conf b/config/fms-core/wtest_core.conf
index db5fd37..48c044e 100644
--- a/config/fms-core/wtest_core.conf
+++ b/config/fms-core/wtest_core.conf
@@ -39,6 +39,7 @@ logger.play = INFO
 # Logger provided to your application:
 logger.application = DEBUG
 
+
 # WS
 play.ws.timeout {
   connection = 6s // evolutions.evolutions is 120
@@ -128,8 +129,8 @@ kafka.server.address="172.20.24.171:9092"
 kafka.gps.topic=fleet-api-gps
 kafka.notification.topic=fleet-api-notification
 
-# fms_gps Server (waylens-fms-gps)
-fms_gps.server.address = "http://172.20.24.171:9004"
+# fms_gps Server (waylens-fms-clip)
+fms_gps.server.address = "http://100.66.240.213:9004"
 # notification push server (waylens-fms-notification)
 provider.waylens.notificationPusher.endpoint="http://172.20.24.171:8060/fmsKafka"
 
@@ -194,16 +195,16 @@ provider.aws {
 
 # Wowza parameters
 provider.wowza {
-  defaultPublishServer = "rtmp://54.255.235.62"
+  defaultPublishServer = "rtmp://13.229.12.162"
   appName = "live_fleet"
-  publishUsername = "publisher"
-  publishPassword = "rnxnTbcpJWwTVY0L"
+  publishUsername = "publishfleet"
+  publishPassword = "E54d22d793"
   playSecret = "Sh4Tgsl2l43lB"
   playParam = "fleet"
   playProtocol = "rtmp"
   playProtocolCN = "rtmp"
   audio{
-    host="54.255.235.62"
+    host="13.229.12.162"
     port=1935
     appName="live_audio",
     publishUsername = "fleet_audio"
@@ -211,11 +212,15 @@ provider.wowza {
   }
   privateIPMap {
     #"18.116.56.97": "172.31.34.99"
-    "54.255.235.62": "172.20.24.171"
   }
 
   domainMap {
-    "172.20.24.171": "54.255.235.62"
+    #"172.31.9.208"  : "13.229.12.162"
+    #"172.31.9.208": "616e881f8f6db.streamlock.net"
+    #"13.229.12.162": "616e881f8f6db.streamlock.net"
+    #"172.31.9.208": "619c7e3c4e66c.streamlock.net"
+    #"13.229.12.162": "619c7e3c4e66c.streamlock.net"
+    "172.31.9.208": "13.229.12.162"
   }
 }
 
diff --git a/config/fms-master/logback.xml b/config/fms-master/logback.xml
index b449010..bf0e726 100644
--- a/config/fms-master/logback.xml
+++ b/config/fms-master/logback.xml
@@ -1,24 +1,64 @@
 <configuration>
-
-    <appender name="TXT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${log.txtfile}_%d{yyyy-MM-dd}.log </FileNamePattern>
-        </rollingPolicy>
-
+    <!--appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>${application.home}/logs/application.log</file>
         <encoder>
             <pattern>%coloredLevel %logger{128} %d{yyyy-MM-dd HH:mm:ss.SSSXXX, UTC} in %thread %message%n%xException{5}</pattern>
         </encoder>
-    </appender>
+    </appender-->
+    <property name="log.txtfile" value="/opt/cap/fms-master/logs/access_master"/>
+
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!--<encoder class="net.logstash.logback.encoder.LogstashEncoder" />-->
         <encoder>
-            <pattern>%coloredLevel %logger{128} %d{yyyy-MM-dd HH:mm:ss.SSSXXX, UTC} %message%n%xException{5}</pattern>
+            <!--pattern>[%level] - [%d{yyyy-MM-dd HH:mm:ss.SSS, XXX}] - from [%logger] in %thread
+                %n%message%n%xException%n</pattern-->
+            <!--pattern>%coloredLevel %logger{15} - %message%n%xException{5}</pattern-->
+		<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5}</pattern>
+        </encoder>
+    </appender>
+    
+    <appender name="TXT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+		<FileNamePattern>${log.txtfile}_%d{yyyy-MM-dd}.log </FileNamePattern>
+        </rollingPolicy>
+
+        <encoder>
+		<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5}</pattern>
         </encoder>
     </appender>
 
-    <root level="INFO">
-      <appender-ref ref="TXT_FILE"/>
+    <!--logger name="play" level="DEBUG"/-->
+    <logger name="play" level="INFO"/>
+    <!--logger name="application" level="DEBUG"/-->
+    <logger name="application" level="INFO"/>
+    <logger name="models" level="INFO"/>
+    <logger name="controllers" level="INFO"/>
+    <logger name="actors" level="DEBUG"/>
+    <logger name="utils" level="INFO"/>
+    <logger name="test" level="INFO"/>
+    <logger name="com.waylens.lib" level="INFO"/>
+    <logger name="ch.qos" level="DEBUG"/>
+
+
+    <!-- Off these ones as they are annoying, and anyway we manage configuration ourself -->
+    <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF"/>
+    <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF"/>
+    <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF"/>
+    <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF"/>
+    <logger name="com.mohiva.play.silhouette" level="DEBUG"/>
+    <logger name="org.apache.hadoop.mapred" level="DEBUG"/>
+    <!--logger name="io.netty" level="TRACE"/-->
+    <!--logger name="org.asynchttpclient" level="TRACE"/-->
+    <logger name="akka" level="INFO"/>
+    <logger name="slick" level="INFO"/>
+    <!--logger name="scala.concurrent" level="TRACE"/-->
+    <!--logger name="com.ning" level="TRACE"/-->
+    <!--logger name="play.api.mvc.Action" level="TRACE"/-->    
+    <!--logger name="com.zaxxer.hikari" level="TRACE"/-->
+
+    <root level="DEBUG">
+        <appender-ref ref="TXT_FILE"/>
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
diff --git a/config/fms-master/master1.conf b/config/fms-master/master1.conf
index d3aaba1..72e5f3d 100644
--- a/config/fms-master/master1.conf
+++ b/config/fms-master/master1.conf
@@ -5,7 +5,7 @@ akka {
   remote {
     netty {
       tcp {
-        hostname = 127.0.0.1
+        hostname = 172.20.24.171
         port = 2551
       }
     }
@@ -13,8 +13,8 @@ akka {
 
   cluster {
     seed-nodes = [
-      "akka.tcp://ClusterSystem@127.0.0.1:2551",
-      "akka.tcp://ClusterSystem@127.0.0.1:2552"]
+      "akka.tcp://ClusterSystem@172.20.24.171:2551",
+      "akka.tcp://ClusterSystem@172.20.24.171:2552"]
 
   #  auto-down-unreachable-after = 10s
   }
diff --git a/config/fms-notification/config.yaml b/config/fms-notification/config.yaml
index c6ea6da..6ae2ba9 100644
--- a/config/fms-notification/config.yaml
+++ b/config/fms-notification/config.yaml
@@ -20,7 +20,7 @@ kafka:
   commitInterval:
     gps: 1000
     general: 0
-  version: 2.6.3    
+  version: 2.6.3
 
 aws:
   config: