diff --git a/pyproject.toml b/pyproject.toml
index f2ee21a2e..35cf11bae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
     "jinja2",
     "GitPython",
     "semantic-version",
-    "pvi~=0.8",         # pvi currently tracks breaking changes with minor version
+    "pvi",
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
 license.file = "LICENSE"
diff --git a/src/ibek/support_cmds/commands.py b/src/ibek/support_cmds/commands.py
index a9c51aec6..9827e0e39 100644
--- a/src/ibek/support_cmds/commands.py
+++ b/src/ibek/support_cmds/commands.py
@@ -17,7 +17,6 @@
 
 from ibek.globals import (
     GLOBALS,
-    IBEK_GLOBALS,
     PVI_YAML_PATTERN,
     SUPPORT_YAML_PATTERN,
     NaturalOrderGroup,
diff --git a/tests/samples/outputs/quadem/NDPluginStats.pvi.bob b/tests/samples/outputs/quadem/NDPluginStats.pvi.bob
index bf8a3bf84..4674f8f19 100644
--- a/tests/samples/outputs/quadem/NDPluginStats.pvi.bob
+++ b/tests/samples/outputs/quadem/NDPluginStats.pvi.bob
@@ -73,19 +73,28 @@
     <transparent>true</transparent>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Array Size X</text>
+      <text>Min Y</text>
       <x>0</x>
       <y>0</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry</name>
+      <pv_name>$(P)$(R)MinY</pv_name>
+      <x>155</x>
+      <y>0</y>
+      <width>100</width>
+      <height>20</height>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)ArraySizeX_RBV</pv_name>
-      <x>155</x>
+      <pv_name>$(P)$(R)MinY_RBV</pv_name>
+      <x>260</x>
       <y>0</y>
-      <width>205</width>
+      <width>100</width>
       <height>20</height>
       <font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
@@ -95,19 +104,28 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Array Size Y</text>
+      <text>Min X</text>
       <x>0</x>
       <y>25</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry</name>
+      <pv_name>$(P)$(R)MinX</pv_name>
+      <x>155</x>
+      <y>25</y>
+      <width>100</width>
+      <height>20</height>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)ArraySizeY_RBV</pv_name>
-      <x>155</x>
+      <pv_name>$(P)$(R)MinX_RBV</pv_name>
+      <x>260</x>
       <y>25</y>
-      <width>205</width>
+      <width>100</width>
       <height>20</height>
       <font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
@@ -117,7 +135,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Array Size</text>
+      <text>Array Size X</text>
       <x>0</x>
       <y>50</y>
       <width>150</width>
@@ -126,7 +144,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)ArraySize_RBV</pv_name>
+      <pv_name>$(P)$(R)ArraySizeX_RBV</pv_name>
       <x>155</x>
       <y>50</y>
       <width>205</width>
@@ -139,27 +157,19 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Data Type</text>
+      <text>Array Size Y</text>
       <x>0</x>
       <y>75</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
-    <widget type="combo" version="2.0.0">
-      <name>ComboBox</name>
-      <pv_name>$(P)$(R)DataType</pv_name>
-      <x>155</x>
-      <y>75</y>
-      <width>100</width>
-      <height>20</height>
-    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)DataType_RBV</pv_name>
-      <x>260</x>
+      <pv_name>$(P)$(R)ArraySizeY_RBV</pv_name>
+      <x>155</x>
       <y>75</y>
-      <width>100</width>
+      <width>205</width>
       <height>20</height>
       <font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
@@ -169,27 +179,19 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Color Mode</text>
+      <text>Array Size</text>
       <x>0</x>
       <y>100</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
-    <widget type="combo" version="2.0.0">
-      <name>ComboBox</name>
-      <pv_name>$(P)$(R)ColorMode</pv_name>
-      <x>155</x>
-      <y>100</y>
-      <width>100</width>
-      <height>20</height>
-    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)ColorMode_RBV</pv_name>
-      <x>260</x>
+      <pv_name>$(P)$(R)ArraySize_RBV</pv_name>
+      <x>155</x>
       <y>100</y>
-      <width>100</width>
+      <width>205</width>
       <height>20</height>
       <font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
@@ -199,25 +201,24 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Min Y</text>
+      <text>Data Type</text>
       <x>0</x>
       <y>125</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>TextEntry</name>
-      <pv_name>$(P)$(R)MinY</pv_name>
+    <widget type="combo" version="2.0.0">
+      <name>ComboBox</name>
+      <pv_name>$(P)$(R)DataType</pv_name>
       <x>155</x>
       <y>125</y>
       <width>100</width>
       <height>20</height>
-      <horizontal_alignment>1</horizontal_alignment>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)MinY_RBV</pv_name>
+      <pv_name>$(P)$(R)DataType_RBV</pv_name>
       <x>260</x>
       <y>125</y>
       <width>100</width>
@@ -230,25 +231,24 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Min X</text>
+      <text>Color Mode</text>
       <x>0</x>
       <y>150</y>
       <width>150</width>
       <height>20</height>
       <tooltip>$(text)</tooltip>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>TextEntry</name>
-      <pv_name>$(P)$(R)MinX</pv_name>
+    <widget type="combo" version="2.0.0">
+      <name>ComboBox</name>
+      <pv_name>$(P)$(R)ColorMode</pv_name>
       <x>155</x>
       <y>150</y>
       <width>100</width>
       <height>20</height>
-      <horizontal_alignment>1</horizontal_alignment>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>$(P)$(R)MinX_RBV</pv_name>
+      <pv_name>$(P)$(R)ColorMode_RBV</pv_name>
       <x>260</x>
       <y>150</y>
       <width>100</width>
diff --git a/tests/samples/outputs/quadem/NDPluginStats.pvi.template b/tests/samples/outputs/quadem/NDPluginStats.pvi.template
index df0466727..6d27af976 100644
--- a/tests/samples/outputs/quadem/NDPluginStats.pvi.template
+++ b/tests/samples/outputs/quadem/NDPluginStats.pvi.template
@@ -23,10 +23,10 @@ record("*", "$(P)$(R)Net_RBV") {
     })
 }
 
-record("*", "$(P)$(R)ArraySizeX_RBV") {
+record("*", "$(P)$(R)MinY") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.ArraySizeX.r": {
+            "pvi.MinY.w": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -34,10 +34,10 @@ record("*", "$(P)$(R)ArraySizeX_RBV") {
     })
 }
 
-record("*", "$(P)$(R)ArraySizeY_RBV") {
+record("*", "$(P)$(R)MinY_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.ArraySizeY.r": {
+            "pvi.MinY.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -45,10 +45,10 @@ record("*", "$(P)$(R)ArraySizeY_RBV") {
     })
 }
 
-record("*", "$(P)$(R)ArraySize_RBV") {
+record("*", "$(P)$(R)MinX") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.ArraySize.r": {
+            "pvi.MinX.w": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -56,10 +56,10 @@ record("*", "$(P)$(R)ArraySize_RBV") {
     })
 }
 
-record("*", "$(P)$(R)DataType") {
+record("*", "$(P)$(R)MinX_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.DataType.w": {
+            "pvi.MinX.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -67,10 +67,10 @@ record("*", "$(P)$(R)DataType") {
     })
 }
 
-record("*", "$(P)$(R)DataType_RBV") {
+record("*", "$(P)$(R)ArraySizeX_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.DataType.r": {
+            "pvi.ArraySizeX.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -78,10 +78,10 @@ record("*", "$(P)$(R)DataType_RBV") {
     })
 }
 
-record("*", "$(P)$(R)ColorMode") {
+record("*", "$(P)$(R)ArraySizeY_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.ColorMode.w": {
+            "pvi.ArraySizeY.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -89,10 +89,10 @@ record("*", "$(P)$(R)ColorMode") {
     })
 }
 
-record("*", "$(P)$(R)ColorMode_RBV") {
+record("*", "$(P)$(R)ArraySize_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.ColorMode.r": {
+            "pvi.ArraySize.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -100,10 +100,10 @@ record("*", "$(P)$(R)ColorMode_RBV") {
     })
 }
 
-record("*", "$(P)$(R)MinY") {
+record("*", "$(P)$(R)DataType") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.MinY.w": {
+            "pvi.DataType.w": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -111,10 +111,10 @@ record("*", "$(P)$(R)MinY") {
     })
 }
 
-record("*", "$(P)$(R)MinY_RBV") {
+record("*", "$(P)$(R)DataType_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.MinY.r": {
+            "pvi.DataType.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -122,10 +122,10 @@ record("*", "$(P)$(R)MinY_RBV") {
     })
 }
 
-record("*", "$(P)$(R)MinX") {
+record("*", "$(P)$(R)ColorMode") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.MinX.w": {
+            "pvi.ColorMode.w": {
                 "+channel": "NAME",
                 "+type": "plain",
             }
@@ -133,10 +133,10 @@ record("*", "$(P)$(R)MinX") {
     })
 }
 
-record("*", "$(P)$(R)MinX_RBV") {
+record("*", "$(P)$(R)ColorMode_RBV") {
     info(Q:group, {
         "$(P)$(R)PVI": {
-            "pvi.MinX.r": {
+            "pvi.ColorMode.r": {
                 "+channel": "NAME",
                 "+type": "plain",
             }