diff --git a/.firmwareci/.jinja2_templates/defaults.j2 b/.firmwareci/.jinja2_templates/defaults.j2
index 68d1052..1bf255c 100644
--- a/.firmwareci/.jinja2_templates/defaults.j2
+++ b/.firmwareci/.jinja2_templates/defaults.j2
@@ -1,7 +1,7 @@
 ## Can be changed depending on the FWCI tester device used
 {%- set RPI_HOSTNAME = "fwci-dutctl-tester" %}
 {%- set RPI_FQDN = RPI_HOSTNAME ~ ".sec.9e.network" %}
-{%- set RPI_RESERVATION_SYSTEM =  "mock" %}
+{%- set RPI_RESERVATION_SYSTEM =  "dutctl" %}
 ## Do not change values below, unless you know what you are doing
 {%- set PKG_NAME = "dutctl" %}
 {%- set DUTCTL_CONFIG_FILE = "/etc/dutctl.yaml" %}
diff --git a/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml b/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml
index c020458..15b5fd5 100644
--- a/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml
+++ b/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml
@@ -2,6 +2,7 @@
 # Device-under-Test Configuration for RaspberryPi acting as dutctl tester
 name: fwci-dutctl-tester
 label: fwci-dutctl-tester
-reservation-system: mock
+reservation-system: dutctl
 attributes:
-  Host: "fwci-dutctl-tester.sec.9e.network"
+  Agent: "fwci-dutctl-tester.sec.9e.network:2024"
+  Device: "device1"
diff --git a/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml.j2 b/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml.j2
index ea0a2a1..010f834 100644
--- a/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml.j2
+++ b/.firmwareci/duts/dut-rpi-dutctl-tester/dut.yaml.j2
@@ -5,4 +5,5 @@ name: {{ defaults.RPI_HOSTNAME }}
 label: {{ defaults.RPI_HOSTNAME }}
 reservation-system: {{ defaults.RPI_RESERVATION_SYSTEM }}
 attributes:
-  Host: "{{ defaults.RPI_FQDN }}"
+  Agent: "{{ defaults.RPI_FQDN }}:{{ defaults.DUTAGENT_PORT }}"
+  Device: "device1"