diff --git a/Robot-Framework/config/variables.robot b/Robot-Framework/config/variables.robot
index 5ca0ad42..4532222e 100644
--- a/Robot-Framework/config/variables.robot
+++ b/Robot-Framework/config/variables.robot
@@ -35,7 +35,7 @@ Set Variables
     Set Global Variable  ${NETVM_SERVICE}      microvm@${NETVM_NAME}.service
     Set Global Variable  ${NETVM_IP}           192.168.101.1
     Set Global Variable  ${GUI_VM}             gui-vm
-    Set Global Variable  ${CHROMIUM_VM}        chromium-vm
+    Set Global Variable  ${CHROME_VM}          chrome-vm
     Set Global Variable  ${GALA_VM}            gala-vm
     Set Global Variable  ${ZATHURA_VM}         zathura-vm
     Set Global Variable  ${COMMS_VM}           comms-vm
diff --git a/Robot-Framework/test-suites/bat-tests/apps.robot b/Robot-Framework/test-suites/bat-tests/apps.robot
index 96a56d22..db12f5a5 100644
--- a/Robot-Framework/test-suites/bat-tests/apps.robot
+++ b/Robot-Framework/test-suites/bat-tests/apps.robot
@@ -26,16 +26,16 @@ Start Firefox
     Check that the application was started    firefox
     [Teardown]  Kill Process And Log journalctl
 
-Start Chromium on LenovoX1
-    [Documentation]   Start Chromium in dedicated VM and verify process started
+Start Chrome on LenovoX1
+    [Documentation]   Start Chrome in dedicated VM and verify process started
     [Tags]            bat   SP-T92   lenovo-x1
-    Verify service status  range=15  service=microvm@chromium-vm.service  expected_status=active  expected_state=running
+    Verify service status  range=15  service=microvm@chrome-vm.service  expected_status=active  expected_state=running
     Connect to netvm
     Connect to VM       ${GUI_VM}
-    Check if ssh is ready on vm    ${CHROMIUM_VM}
-    Start XDG application   Chromium
-    Connect to VM       ${CHROMIUM_VM}
-    Check that the application was started    chromium
+    Check if ssh is ready on vm    ${CHROME_VM}
+    Start XDG application   'Google Chrome'
+    Connect to VM       ${CHROME_VM}
+    Check that the application was started    chrome
     [Teardown]  Kill Process And Log journalctl
 
 Start Zathura on LenovoX1
diff --git a/Robot-Framework/test-suites/bat-tests/business_vm.robot b/Robot-Framework/test-suites/bat-tests/business_vm.robot
index 7a78385f..5efd4084 100644
--- a/Robot-Framework/test-suites/bat-tests/business_vm.robot
+++ b/Robot-Framework/test-suites/bat-tests/business_vm.robot
@@ -51,5 +51,5 @@ Start Trusted Browser on LenovoX1
     Connect to VM       ${GUI_VM}
     Start XDG application   "Trusted Browser"
     Connect to VM       ${BUSINESS_VM}
-    Check that the application was started    chromium
+    Check that the application was started    chrome
     [Teardown]  Kill process  @{app_pids}
diff --git a/Robot-Framework/test-suites/gui-tests/gui_apps.robot b/Robot-Framework/test-suites/gui-tests/gui_apps.robot
index 9669d1fb..e7816c35 100644
--- a/Robot-Framework/test-suites/gui-tests/gui_apps.robot
+++ b/Robot-Framework/test-suites/gui-tests/gui_apps.robot
@@ -20,13 +20,13 @@ ${start_menu}       ./launcher.png
 
 *** Test Cases ***
 
-Start and close chromium via GUI on LenovoX1
-    [Documentation]   Start Chromium via GUI test automation and verify related process started
-    ...               Close Chromium via GUI test automation and verify related process stopped
+Start and close chrome via GUI on LenovoX1
+    [Documentation]   Start Chrome via GUI test automation and verify related process started
+    ...               Close Chrome via GUI test automation and verify related process stopped
     [Tags]            SP-T41   lenovo-x1
-    Get icon   app  chromium.svg  crop=30
-    Start app via GUI on LenovoX1   chromium-vm  chromium
-    Close app via GUI on LenovoX1   chromium-vm  chromium  ./window-close-neg.png
+    Get icon   app  google-chrome.svg  crop=30
+    Start app via GUI on LenovoX1   ${CHROME_VM}  chrome
+    Close app via GUI on LenovoX1   ${CHROME_VM}  google-chrome  ./window-close-neg.png
 
 Start and close Firefox via GUI on Orin AGX
     [Documentation]   Passing this test requires that display is connected to the target device
diff --git a/Robot-Framework/test-suites/performance-tests/performance.robot b/Robot-Framework/test-suites/performance-tests/performance.robot
index d0a27ae6..2b906a2a 100644
--- a/Robot-Framework/test-suites/performance-tests/performance.robot
+++ b/Robot-Framework/test-suites/performance-tests/performance.robot
@@ -277,7 +277,7 @@ Sysbench test in VMs on LenovoX1
     ...                                  gui-vm=2
     ...                                  gala-vm=2
     ...                                  zathura-vm=1
-    ...                                  chromium-vm=4
+    ...                                  chrome-vm=4
     ...                                  comms-vm=4
     ...                                  admin-vm=1
     ...                                  audio-vm=1
diff --git a/pkgs/ghaf-robot/default.nix b/pkgs/ghaf-robot/default.nix
index 50400068..f10120f0 100644
--- a/pkgs/ghaf-robot/default.nix
+++ b/pkgs/ghaf-robot/default.nix
@@ -1,6 +1,7 @@
 {
   PyP100,
   iperf,
+  imagemagick,
   plugp100,
   python3,
   robotframework-advancedlogging,
@@ -14,6 +15,7 @@ writeShellApplication {
   name = "ghaf-robot";
   runtimeInputs = [
     iperf
+    imagemagick
     (python3.withPackages (ps: [
       # These are taken from nixpkgs
       ps.robotframework
@@ -23,6 +25,7 @@ writeShellApplication {
       ps.pytz
       ps.pandas
       ps.pyscreeze
+      ps.opencv4
 
       # These are taken from this flake
       robotframework-advancedlogging