diff --git a/ghaf-main-pipeline.groovy b/ghaf-main-pipeline.groovy
index becaa1d..c7c8669 100644
--- a/ghaf-main-pipeline.groovy
+++ b/ghaf-main-pipeline.groovy
@@ -29,7 +29,7 @@ def targets = [
   [ target: "lenovo-x1-carbon-gen11-debug.x86_64-linux",
     hwtest_device: "lenovo-x1" ],
   [ target: "microchip-icicle-kit-debug-from-x86_64.x86_64-linux",
-    hwtest_device: null ],
+    hwtest_device: "riscv" ],
   [ target: "nvidia-jetson-orin-agx-debug.aarch64-linux",
     hwtest_device: "orin-agx" ],
   [ target: "nvidia-jetson-orin-agx-debug-from-x86_64.x86_64-linux",
diff --git a/tests/x-ghaf-hw-test.groovy b/tests/x-ghaf-hw-test.groovy
index 6618d5b..082ae3d 100644
--- a/tests/x-ghaf-hw-test.groovy
+++ b/tests/x-ghaf-hw-test.groovy
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 def REPO_URL = 'https://github.com/tiiuae/ci-test-automation/'
-def DEF_LABEL = 'testagent'
+def DEF_LABEL = ''
 def TMP_IMG_DIR = './image'
 def CONF_FILE_PATH = '/etc/jenkins/test_config.json'
 
@@ -15,6 +15,7 @@ def CONF_FILE_PATH = '/etc/jenkins/test_config.json'
 properties([
   parameters([
     string(name: 'IMG_URL', defaultValue: 'https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/artifacts/ghaf-release-pipeline/build_8-commit_5c270677069b96cc43ae2578a72ece272d7e1a37/packages.aarch64-linux.nvidia-jetson-orin-nx-debug/sd-image/nixos-sd-image-24.11.20240802.c488d21-aarch64-linux.img.zst', description: 'Target image url'),
+    string(name: 'LABEL', defaultValue: '', description: "Target testagent need to match with target image device! 'orin-nx', 'orin-agx', 'nuc', 'riscv' or 'lenovo-x1'"),
     string(name: 'TESTSET', defaultValue: '_boot_', description: 'Target test set (_boot_, _bat_, _perf_, or a combination e.g.: _boot_bat_perf_)'),
     booleanParam(name: 'REFRESH', defaultValue: false, description: 'Read the Jenkins pipeline file and exit, setting the build status to failure.')
   ])
@@ -324,4 +325,3 @@ pipeline {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-