diff --git a/coin/instructions/cmake_run_ctest.yaml b/coin/instructions/cmake_run_ctest.yaml
index c853b0efd60..0c58a83b209 100644
--- a/coin/instructions/cmake_run_ctest.yaml
+++ b/coin/instructions/cmake_run_ctest.yaml
@@ -21,8 +21,8 @@ instructions:
     variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
     enable_if:
       condition: property
-      property: target.osVersion
-      in_values: [QNX_710]
+      property: target.os
+      equals_value: QNX
   - type: AppendToEnvironmentVariable
     variableName: TESTRUNNER
     variableValue: " {{.AgentWorkingDir}}/coin_vxworks_qemu_runner.sh"
diff --git a/coin/instructions/cmake_setup_running_tests_env_vars.yaml b/coin/instructions/cmake_setup_running_tests_env_vars.yaml
index 97479d62e2f..56c1336bd32 100644
--- a/coin/instructions/cmake_setup_running_tests_env_vars.yaml
+++ b/coin/instructions/cmake_setup_running_tests_env_vars.yaml
@@ -18,7 +18,7 @@ instructions:
           equals_property: target.os
         - condition: property
           property: target.osVersion
-          not_in_values: [QEMU, QNX_710, VxWorks]
+          not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
   - type: Group
     instructions:
       - type: EnvironmentVariable
@@ -32,7 +32,7 @@ instructions:
           equals_property: target.os
         - condition: property
           property: target.osVersion
-          not_in_values: [QEMU, QNX_710, VxWorks]
+          not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
   - type: Group
     instructions:
       - !include "{{qt/qtbase}}/cmake_setup_running_qnxqemu_tests_env_vars.yaml"
@@ -40,8 +40,8 @@ instructions:
       condition: and
       conditions:
         - condition: property
-          property: target.osVersion
-          equals_value: QNX_710
+          property: target.os
+          equals_value: QNX
         - condition: property
           property: features
           not_contains_value: DisableTests
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
index 5b05600c7af..9190c88569f 100644
--- a/coin/instructions/coin_module_build_template_v2.yaml
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@@ -64,7 +64,7 @@ instructions:
       conditions:
         - condition: property
           property: target.osVersion
-          in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
+          in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
         - condition: and
           conditions:
             - condition: property
diff --git a/coin/instructions/coin_module_test_qnx_start_emulator.yaml b/coin/instructions/coin_module_test_qnx_start_emulator.yaml
index 074f9545aa2..e68ec0820b4 100644
--- a/coin/instructions/coin_module_test_qnx_start_emulator.yaml
+++ b/coin/instructions/coin_module_test_qnx_start_emulator.yaml
@@ -73,8 +73,8 @@ instructions:
       condition: and
       conditions:
         - condition: property
-          property: target.osVersion
-          equals_value: QNX_710
+          property: target.os
+          equals_value: QNX
         - condition: property
           property: features
           not_contains_value: DisableTests
diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml
index ae617713951..ebc6b67327c 100644
--- a/coin/instructions/coin_module_test_template_v2.yaml
+++ b/coin/instructions/coin_module_test_template_v2.yaml
@@ -24,7 +24,7 @@ instructions:
               equals_property: target.os
             - condition: property
               property: target.osVersion
-              in_values: [QEMU, QNX_710]
+              in_values: [QEMU, QNX_710, QNX_800]
     disable_if:
       condition: or
       conditions:
diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml
index e9df6aedfe5..14cf44699a1 100644
--- a/coin/instructions/coin_module_test_template_v3.yaml
+++ b/coin/instructions/coin_module_test_template_v3.yaml
@@ -22,7 +22,7 @@ instructions:
               equals_property: target.os
             - condition: property
               property: target.osVersion
-              in_values: [QEMU, QNX_710, IOS_ANY]
+              in_values: [QEMU, QNX_710, QNX_800, IOS_ANY]
             - condition: property
               property: features
               contains_value: AndroidTestRun
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
index 4918069a955..5bc615808e9 100644
--- a/coin/instructions/coin_qtbase_build_template_v2.yaml
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -52,7 +52,7 @@ instructions:
       conditions:
         - condition: property
           property: target.osVersion
-          in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
+          in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
         - condition: and
           conditions:
             - condition: property
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index ee0295bba67..8962d66ac11 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -369,6 +369,22 @@ instructions:
         variableValue: "{{.Env.VXWORKS_HOME}}/wrenv.linux"
 
   # QNX variables
+  - type: EnvironmentVariable
+    variableName: QNX_ACTIVE
+    variableValue: "{{.Env.QNX_710}}"
+    enable_if:
+      condition: property
+      property: target.osVersion
+      equals_value: QNX_710
+
+  - type: EnvironmentVariable
+    variableName: QNX_ACTIVE
+    variableValue: "{{.Env.QNX_800}}"
+    enable_if:
+      condition: property
+      property: target.osVersion
+      equals_value: QNX_800
+
   - type: Group
     enable_if:
       condition: and
@@ -380,63 +396,45 @@ instructions:
           property: target.os
           equals_value: QNX
     instructions:
-    - type: EnvironmentVariable
-      variableName: QNX_TARGET
-      variableValue: "{{.Env.QNX_710}}/target/qnx7"
     - type: EnvironmentVariable
       variableName: QNX_CONFIGURATION_EXCLUSIVE
       variableValue: "{{.Env.HOME}}/.qnx"
     - type: EnvironmentVariable
       variableName: QNX_CONFIGURATION
       variableValue: "{{.Env.HOME}}/.qnx"
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "{{.Env.QNX_710}}/host/linux/x86_64/usr/bin:"
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "{{.Env.QNX_710}}/host/common/bin:"
     - type: PrependToEnvironmentVariable
       variableName: PATH
       variableValue: "{{.Env.HOME}}/.qnx:"
-    - type: EnvironmentVariable
-      variableName: QNX_HOST
-      variableValue: "{{.Env.QNX_710}}/host/linux/x86_64"
     - type: AppendToEnvironmentVariable
       variableName: PATH
       variableValue: ":{{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/bin:"
+    - type: EnvironmentVariable
+      variableName: QNX_TARGET
+      variableValue: "{{.Env.QNX_ACTIVE}}/target/qnx7"
+    - type: PrependToEnvironmentVariable
+      variableName: PATH
+      variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64/usr/bin:"
+    - type: PrependToEnvironmentVariable
+      variableName: PATH
+      variableValue: "{{.Env.QNX_ACTIVE}}/host/common/bin:"
+    - type: EnvironmentVariable
+      variableName: QNX_HOST
+      variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64"
 
-  - type: Group
+  - type: SetEnvironmentFromScript
+    command: "{{.Env.QNX_ACTIVE}}\\qnxsdp-env.bat"
+    userMessageOnFailure: "Failed to set QNX environment"
+    maxTimeInSeconds: 60
+    maxTimeBetweenOutput: 60
     enable_if:
       condition: and
       conditions:
         - condition: property
-          property: host.os
-          equals_value: Windows
+          property: target.osVersion
+          contains_value: QNX
         - condition: property
-          property: target.os
-          equals_value: QNX
-    instructions:
-    - type: EnvironmentVariable
-      variableName: QNX_TARGET
-      variableValue: "{{.Env.QNX_710_CMAKE}}/target/qnx7"
-    - type: EnvironmentVariable
-      variableName: QNX_CONFIGURATION_EXCLUSIVE
-      variableValue: "{{.Env.HOMEPATH}}\\.qnx"
-    - type: EnvironmentVariable
-      variableName: QNX_CONFIGURATION
-      variableValue: "{{.Env.HOMEPATH}}\\.qnx"
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64\\usr\\bin;"
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "{{.Env.QNX_710}}\\host\\common\\bin;"
-    - type: PrependToEnvironmentVariable
-      variableName: PATH
-      variableValue: "{{.Env.HOMEPATH}}\\.qnx;"
-    - type: EnvironmentVariable
-      variableName: QNX_HOST
-      variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64"
+          property: host.os
+          contains_value: Windows
 
   # Enable warnings are errors
   - type: Group