Index: cloud_sync.py
===================================================================
diff -u -r212c40f5d16ccbf9eefa244fad747e9abda61b60 -rffd84be0e5792296879d1fa3c53a362bea6ae891
--- cloud_sync.py	(.../cloud_sync.py)	(revision 212c40f5d16ccbf9eefa244fad747e9abda61b60)
+++ cloud_sync.py	(.../cloud_sync.py)	(revision ffd84be0e5792296879d1fa3c53a362bea6ae891)
@@ -20,7 +20,7 @@
 from cloudsync.utils.heartbeat import HeartBeatProvider
 from cloudsync.handlers.error import Error
 
-VERSION = "0.4.7"
+VERSION = "0.4.8"
 
 arguments = sys.argv
 log_level = int(arguments[1])
Index: cloudsync/config/config-production-on-device.json.backup
===================================================================
diff -u
--- cloudsync/config/config-production-on-device.json.backup	(revision 0)
+++ cloudsync/config/config-production-on-device.json.backup	(revision ffd84be0e5792296879d1fa3c53a362bea6ae891)
@@ -0,0 +1,20 @@
+{
+    "kebormed_paas": {
+        "idp_client_secret": "mgSKLwfdqVXfp5SikFLq0ppr2V8JH9Ko",
+        "url_mft": "http://192.168.0.178:3000",
+        "url_dcs": "https://device-api.moda-flx-connect.com",
+        "url_device_identity": "https://device-identity.moda-flx-connect.com/auth/realms/Main/protocol/openid-connect/token",
+        "url_reachability": "https://healthcheck.moda-flx-connect.com",
+        "dia_org_id": 1
+    },
+    "device": {
+        "ip": "192.168.0.61",
+        "port": 80,
+        "name": "DVT-BN",
+        "hd_serial": "DVT-BN",
+        "dg_serial": "DVT-BN",
+        "sw_version": "staging-0.9.3.261-10",
+        "mode": "operation",
+        "device_state": 6
+    }
+}
\ No newline at end of file
Index: cloudsync/config/config_PROD.json
===================================================================
diff -u
--- cloudsync/config/config_PROD.json	(revision 0)
+++ cloudsync/config/config_PROD.json	(revision ffd84be0e5792296879d1fa3c53a362bea6ae891)
@@ -0,0 +1,21 @@
+{
+    "kebormed_paas": {
+        "idp_client_secret": "mgSKLwfdqVXfp5SikFLq0ppr2V8JH9Ko",
+        "url_mft": "",
+        "url_dcs": "https://api.moda-flx-connect.com",
+        "url_device_identity": "https://device-identity.moda-flx-connect.com/auth/realms/Main/protocol/openid-connect/token"
+        "url_reachability": "https://healthcheck.moda-flx-connect.com",
+        "dia_org_id": 1
+    },
+    "device": {
+        "ip": "",
+        "port": 80,
+        "name": "",
+        "hd_serial": "",
+        "dg_serial": "",
+        "sw_version": "",
+        "mode": "registration",
+        "device_state": "INACTIVE_NOT_OK"
+    }
+}
+
Index: cloudsync/config/config_STAGING.json
===================================================================
diff -u -r212c40f5d16ccbf9eefa244fad747e9abda61b60 -rffd84be0e5792296879d1fa3c53a362bea6ae891
--- cloudsync/config/config_STAGING.json	(.../config_STAGING.json)	(revision 212c40f5d16ccbf9eefa244fad747e9abda61b60)
+++ cloudsync/config/config_STAGING.json	(.../config_STAGING.json)	(revision ffd84be0e5792296879d1fa3c53a362bea6ae891)
@@ -9,7 +9,7 @@
     },
     "device": {
         "ip": "",
-        "port": 5001,
+        "port": 80,
         "name": "",
         "hd_serial": "",
         "dg_serial": "",
Index: cloudsync/handlers/cs_mft_dcs_request_handler.py
===================================================================
diff -u -rae065dc96f33fc1946785ee833356dae959be2d9 -rffd84be0e5792296879d1fa3c53a362bea6ae891
--- cloudsync/handlers/cs_mft_dcs_request_handler.py	(.../cs_mft_dcs_request_handler.py)	(revision ae065dc96f33fc1946785ee833356dae959be2d9)
+++ cloudsync/handlers/cs_mft_dcs_request_handler.py	(.../cs_mft_dcs_request_handler.py)	(revision ffd84be0e5792296879d1fa3c53a362bea6ae891)
@@ -241,13 +241,8 @@
                 # Step #4 - Send treatment report
 
                 association_time = int(round(time() * S_MS_CONVERSION_FACTOR))
-                if response.status_code == SUCCESS:
-                    association_time = int(response.headers.get('X-Timestamp'))
-                    generated_at_time = association_time + 1000
-                    completed_at_time = association_time + 2000
-                else:
-                    generated_at_time = association_time + 301000 # TEMPORARY DELAY TO COMPENSATE FOR DEVICE INTERNAL CLOCK ERROR - TODO REMOVE AFTER FIX
-                    completed_at_time = association_time + 302000 # TEMPORARY DELAY TO COMPENSATE FOR DEVICE INTERNAL CLOCK ERROR - TODO REMOVE AFTER FIX
+                generated_at_time = association_time + 301000 # TEMPORARY DELAY TO COMPENSATE FOR DEVICE INTERNAL CLOCK ERROR - TODO REMOVE AFTER FIX
+                completed_at_time = association_time + 302000 # TEMPORARY DELAY TO COMPENSATE FOR DEVICE INTERNAL CLOCK ERROR - TODO REMOVE AFTER FIX
 
                 treatment_log_json['generatedAt'] = generated_at_time
                 treatment_log_json['completedAt'] = completed_at_time