diff --git a/libs/utils/executor.py b/libs/utils/executor.py
index f5e1f1a328a81e5b01b99a90c4fc7972e3be21e9..733770bc940f670c6ca1011d80ba7070f1ee82ef 100644
--- a/libs/utils/executor.py
+++ b/libs/utils/executor.py
@@ -183,7 +183,10 @@ class Executor():
             # We don't actually need this task but on Google Pixel it apparently
             # cannot be frozen, so the cgroup state gets stuck in FREEZING if we
             # try to freeze it.
-            'thermal-engine'
+            'thermal-engine',
+            # Similar issue with HiKey960, the board will crash if this is frozen
+            # for too long.
+            'watchdogd',
         ]
     }
     """
diff --git a/target.config b/target.config
index 3b04932b8a0a5bffcc3aa31540fba2b7adae06b9..b9ab29377aacb6b66797f72182ea94d16dab2622 100644
--- a/target.config
+++ b/target.config
@@ -11,17 +11,17 @@
     /* - linux   : accessed via SSH connection                    */
     /* - android : accessed via ADB connection                    */
     /* - host    : run on the local host                          */
-    "platform" : "linux",
+    "platform" : "android",
 
     /* Board */
     /* Currently supported boards are:                            */
     /*  juno  : target is a JUNO board                            */
     /*  tc2   : target is a TC2 board                             */
     /* Leave commented if your board is not listed above          */
-    "board" : "juno",
+    "board" : "hikey960",
 
     /* Target IP or MAC address */
-    "host" : "192.168.0.20",
+    //"host" : "192.168.0.20",
 
     /* Target Android device ID */
     //"device" : "00b1346f0878ccb1",
@@ -38,9 +38,9 @@
     /* Keep commented to do calibration at first run on a target. */
     /* Then, replace the values with the ones reported for your   */
     /* specific target in the console logging messages            */
-    // "rtapp-calib" :  {
-    //     "0": 354, "1": 138, "2": 138, "3": 363, "4": 355, "5": 357
-    // },
+     "rtapp-calib" :  {
+	  "0": 302, "1": 302, "2": 302, "3": 302, "4": 136, "5": 136, "6": 136, "7": 136
+     },
 
     /* FTFP Image server */
     /* This is the folder from where the target gets kernel/DTB   */