diff --git a/modules/distribution/src/sketches/sensebot/SenseBotEthernetAgent.h b/modules/distribution/src/sketches/sensebot/SenseBotEthernetAgent.h
index b77bdec5..6c51a03e 100644
--- a/modules/distribution/src/sketches/sensebot/SenseBotEthernetAgent.h
+++ b/modules/distribution/src/sketches/sensebot/SenseBotEthernetAgent.h
@@ -18,8 +18,8 @@
 #define WLAN_SECURITY   WLAN_SEC_WPA2
                            // Security can be WLAN_SEC_UNSEC, WLAN_SEC_WEP, WLAN_SEC_WPA or WLAN_SEC_WPA2
 
-#define DEVICE_OWNER "Test" //"${DEVICE_OWNER}"          
-#define DEVICE_ID "Test" //"${DEVICE_ID}"             
+#define DEVICE_OWNER "${DEVICE_OWNER}"
+#define DEVICE_ID "${DEVICE_ID}"
 
 #define SERVICE_PORT 9763 
 #define SERVICE_EPOINT "/iotdevices/SenseBotController/" 
diff --git a/modules/distribution/src/sketches/sensebot_wifi/PushData.ino b/modules/distribution/src/sketches/sensebot_wifi/PushData.ino
index b670c8a8..7aacaae6 100644
--- a/modules/distribution/src/sketches/sensebot_wifi/PushData.ino
+++ b/modules/distribution/src/sketches/sensebot_wifi/PushData.ino
@@ -21,7 +21,7 @@ void pushData(){
   payLoad += "\"}";
 
   pushClient.fastrprint(F("POST "));     
-  pushClient.fastrprint(SERVICE_EPOINT); pushClient.fastrprint(F("pushsensordata"));  
+  pushClient.fastrprint(SERVICE_EPOINT); pushClient.fastrprint(F("pushsensordata"));
   pushClient.fastrprint(F(" HTTP/1.1")); pushClient.fastrprint(F("\n"));
   pushClient.fastrprint(host.c_str()); pushClient.fastrprint(F("\n"));    
   pushClient.fastrprint(F("Content-Type: application/json")); pushClient.fastrprint(F("\n"));   
diff --git a/modules/distribution/src/sketches/sensebot_wifi/SenseBotWifiAgent.h b/modules/distribution/src/sketches/sensebot_wifi/SenseBotWifiAgent.h
index 73ab2795..9e37451d 100644
--- a/modules/distribution/src/sketches/sensebot_wifi/SenseBotWifiAgent.h
+++ b/modules/distribution/src/sketches/sensebot_wifi/SenseBotWifiAgent.h
@@ -18,11 +18,12 @@
 #define WLAN_SECURITY   WLAN_SEC_WPA2
                            // Security can be WLAN_SEC_UNSEC, WLAN_SEC_WEP, WLAN_SEC_WPA or WLAN_SEC_WPA2
 
-#define DEVICE_OWNER "Test" //"${DEVICE_OWNER}"          
-#define DEVICE_ID "Test" //"${DEVICE_ID}"             
+#define DEVICE_OWNER "${DEVICE_OWNER}"
+#define DEVICE_ID "${DEVICE_ID}"
+
+#define SERVICE_PORT 8281
+#define SERVICE_EPOINT "/sensebotdata/1.0/controller/"
 
-#define SERVICE_PORT 9763 
-#define SERVICE_EPOINT "/iotdevices/SenseBotController/" 
                                         // pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
                                         // readcontrols/{owner}/{deviceId}
                                         // reply - application/json - {"owner":"","deviceId":"","replyMessage":""}