diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
index dff9007..b7e7fcc 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -424,6 +424,11 @@ class HemoCubeViewModel @Inject constructor(
                 testDetails!!.reportUploadTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
+                val currentTimeFormatted = SimpleDateFormat(
+                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    Locale.getDefault()
+                ).format(Calendar.getInstance().time)
+
 //                when (val response = repository.addTestToDatabase(testDetails)) {
 //                    is Response.Success -> {
 //                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
@@ -462,14 +467,14 @@ class HemoCubeViewModel @Inject constructor(
                                 MolbioV2Result(
                                     rawData = sanitizedTestDetails,
                                     analysisId = sanitizedTestDetails._id,
-                                    analysisDate = sanitizedTestDetails.testTime,
+                                    analysisDate = currentTimeFormatted,
                                     analysisStatus = sanitizedTestDetails.classificationResult,
                                     thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
                                     interpretation = sanitizedTestDetails.classificationResult,
                                     testId = sanitizedTestDetails._id,
-                                    testTime = sanitizedTestDetails.testTime,
-                                    collectionTime = sanitizedTestDetails.testTime,
-                                    expiryTime = sanitizedTestDetails.testTime,
+                                    testTime = currentTimeFormatted,
+                                    collectionTime = currentTimeFormatted,
+                                    expiryTime = currentTimeFormatted,
                                 )
                             )
                         )