diff --git a/.gitignore b/.gitignore
index 56db627..9dfe86a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@ venv*
 *workspace
 
 # this is the root directory for generated opi files
-# and is created at runtime
-services/opi
+# and is created at runtime by IOCs using PVI
+opi/iocs
+!opi/iocs/README.md
diff --git a/compose.yaml b/compose.yaml
index 09084aa..0a89dea 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -11,10 +11,10 @@
 # or for a multiple server repo:
 #  docker compose --profile deploy -f my_server_01.yml up --detach
 
-include:
-  # initialise volumes
-  - include/init.yml
+# to deploy the IOCs to a workstation for testing and development, use:
+# docker compose up --detach
 
+include:
   # all profiles
   - services/bl01t-ea-test-01/compose.yml
   - services/bl01t-di-cam-01/compose.yml
diff --git a/include/init.sh b/include/init.sh
deleted file mode 100644
index 40c8234..0000000
--- a/include/init.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# The init service shell script - initialises the opi volumes with any custom
-# bob files from this repo and ensures that each IOC has a subfolder in the
-# volumes.
-
-# copy in any opi files from the repo
-cp -r /repo/opi/* /opi;
diff --git a/include/init.yml b/include/init.yml
deleted file mode 100644
index 3d8d50a..0000000
--- a/include/init.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# A basic init service that sets up volumes for the IOCs described in
-# this repo.
-
-services:
-  init_iocs:
-    image: docker.io/busybox
-
-    command: |
-      sh /repo/include/init.sh
-
-    volumes:
-      # mount the runtime opi folder
-      - ../services/opi:/opi/
-      # mount the repo to copy hand coded opis into runtime opi
-      - ..:/repo
diff --git a/include/ioc.yml b/include/ioc.yml
index 842faf1..80aede9 100644
--- a/include/ioc.yml
+++ b/include/ioc.yml
@@ -5,9 +5,6 @@
 services:
   # linux IOCs that run in a container #########################################
   linux_ioc: &linux_ioc
-    depends_on:
-      - init_iocs
-
     labels:
       # a reference to which repository created this IOC
       ioc_group: bl01t
diff --git a/include/volumes.yml b/include/volumes.yml
deleted file mode 100644
index 3cff8bf..0000000
--- a/include/volumes.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-volumes:
-  # hand coded opi files from this repo
-  opi:
-
-  # Note - for the moment we don't use this volume but instead bind mount
-  # services/opis host folder into the ioc containers.
-  #
-  # This is because of a podman limitation that ignores the subpath field
-  # of a volume mount.
-  #
-  # Keeping this file as a reminder of how we would prefer to use docker
-  # volumes for this purpose once the issue is resolved:
-  # https://github.com/containers/podman/issues/20661
-
-  # in kubernetes we also create volumes for
-  # - autosave
-  # - runtime (mounted to /epics/runtime)
-  # - data - for each IOC that wants to persist data
-  # - binaries - for proxy that control hard IOCs and supply their binaries
-  #
-  # in future this compose framework could include these volumes too
diff --git a/opi/index.bob b/opi/index.bob
index 5e42991..528aebd 100644
--- a/opi/index.bob
+++ b/opi/index.bob
@@ -1,7 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2024-07-23 13:38:18 by root-->
 <display version="2.0.0">
   <name>Example IOCs</name>
-  <x>0</x>
-  <y use_class="true">0</y>
   <width>388</width>
   <height>80</height>
   <grid_step_x>4</grid_step_x>
@@ -31,20 +31,19 @@
     <x>23</x>
     <y>30</y>
     <width>150</width>
-    <height>20</height>
     <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
     <actions>
       <action type="open_display">
-        <file>bl01t-di-cam-01/index.bob</file>
-        <target>tab</target>
-        <description>Open Display</description>
+        <file>iocs/bl01t-di-cam-01/index.bob</file>
         <macros>
           <P>BL01T-EA-TST-01</P>
           <R>:DET:</R>
         </macros>
+        <target>tab</target>
+        <description>Open Display</description>
       </action>
     </actions>
     <text>bl01t-di-cam-01</text>
@@ -60,20 +59,19 @@
     <x>23</x>
     <y>55</y>
     <width>150</width>
-    <height>20</height>
     <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
     <actions>
       <action type="open_display">
-        <file>bl01t-mo-sim-01/index.bob</file>
-        <target>tab</target>
-        <description>Open Display</description>
+        <file>iocs/bl01t-mo-sim-01/index.bob</file>
         <macros>
           <P>BL01T-EA-TST-01</P>
           <R>:PVA:</R>
         </macros>
+        <target>tab</target>
+        <description>Open Display</description>
       </action>
     </actions>
     <text>bl01t-mo-sim-01</text>
@@ -83,4 +81,396 @@
     <height>20</height>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="group" version="3.0.0">
+    <name>CAMERA</name>
+    <macros>
+      <P>BL01T-DI-CAM-01</P>
+      <R>:DET:</R>
+    </macros>
+    <x>416</x>
+    <width>396</width>
+    <height>308</height>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label_3</name>
+      <text>Acquire</text>
+      <y>2</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="choice" version="2.0.0">
+      <name>ToggleButton_1</name>
+      <pv_name>$(P)$(R)Acquire</pv_name>
+      <x>155</x>
+      <y>2</y>
+      <height>20</height>
+      <items>
+        <item>Item 1</item>
+        <item>Item 2</item>
+      </items>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(P)$(R)Acquire_RBV</pv_name>
+      <x>300</x>
+      <y>2</y>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <text>Array Counter</text>
+      <y>27</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry</name>
+      <pv_name>$(P)$(R)ArrayCounter</pv_name>
+      <x>155</x>
+      <y>27</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_1</name>
+      <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+      <x>260</x>
+      <y>27</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <text>Array Callbacks</text>
+      <y>52</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="choice" version="2.0.0">
+      <name>ToggleButton_2</name>
+      <pv_name>$(P)$(R)ArrayCallbacks</pv_name>
+      <x>155</x>
+      <y>52</y>
+      <height>20</height>
+      <items>
+        <item>Item 1</item>
+        <item>Item 2</item>
+      </items>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_1</name>
+      <pv_name>$(P)$(R)ArrayCallbacks_RBV</pv_name>
+      <x>300</x>
+      <y>52</y>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_6</name>
+      <text>Acquire Time</text>
+      <y>77</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry_1</name>
+      <pv_name>$(P)$(R)AcquireTime</pv_name>
+      <x>155</x>
+      <y>77</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_2</name>
+      <pv_name>$(P)$(R)AcquireTime_RBV</pv_name>
+      <x>260</x>
+      <y>77</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_7</name>
+      <text>Acquire Period</text>
+      <y>102</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry_2</name>
+      <pv_name>$(P)$(R)AcquirePeriod</pv_name>
+      <x>155</x>
+      <y>102</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_3</name>
+      <pv_name>$(P)$(R)AcquirePeriod_RBV</pv_name>
+      <x>260</x>
+      <y>102</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_8</name>
+      <text>Num Images Counter</text>
+      <y>127</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_4</name>
+      <pv_name>$(P)$(R)NumImagesCounter_RBV</pv_name>
+      <x>155</x>
+      <y>127</y>
+      <width>205</width>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_9</name>
+      <text>Num Images</text>
+      <y>152</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry_3</name>
+      <pv_name>$(P)$(R)NumImages</pv_name>
+      <x>155</x>
+      <y>152</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_5</name>
+      <pv_name>$(P)$(R)NumImages_RBV</pv_name>
+      <x>260</x>
+      <y>152</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_10</name>
+      <text>Num Exposures</text>
+      <y>177</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry_4</name>
+      <pv_name>$(P)$(R)NumExposures</pv_name>
+      <x>155</x>
+      <y>177</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_6</name>
+      <pv_name>$(P)$(R)NumExposures_RBV</pv_name>
+      <x>260</x>
+      <y>177</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_11</name>
+      <text>Image Mode</text>
+      <y>202</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>ComboBox</name>
+      <pv_name>$(P)$(R)ImageMode</pv_name>
+      <x>155</x>
+      <y>202</y>
+      <height>20</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_7</name>
+      <pv_name>$(P)$(R)ImageMode_RBV</pv_name>
+      <x>260</x>
+      <y>202</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_13</name>
+      <text>Detector State</text>
+      <y>230</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_9</name>
+      <pv_name>$(P)$(R)DetectorState_RBV</pv_name>
+      <x>155</x>
+      <y>230</y>
+      <width>205</width>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_14</name>
+      <text>Status Message</text>
+      <y>255</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_10</name>
+      <pv_name>$(P)$(R)StatusMessage_RBV</pv_name>
+      <x>155</x>
+      <y>255</y>
+      <width>205</width>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <format>6</format>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="3.0.0">
+    <name>PVA</name>
+    <macros>
+      <P>BL01T-DI-CAM-01</P>
+      <R>:PVA:</R>
+    </macros>
+    <x>416</x>
+    <y>299</y>
+    <width>396</width>
+    <height>110</height>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label_19</name>
+      <text>Array Counter</text>
+      <y>52</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>TextEntry_5</name>
+      <pv_name>$(P)$(R)ArrayCounter</pv_name>
+      <x>155</x>
+      <y>52</y>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_13</name>
+      <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+      <x>260</x>
+      <y>52</y>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="choice" version="2.0.0">
+      <name>ToggleButton_6</name>
+      <pv_name>$(P)$(R)EnableCallbacks</pv_name>
+      <x>155</x>
+      <y>2</y>
+      <height>20</height>
+      <items>
+        <item>Item 1</item>
+        <item>Item 2</item>
+      </items>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_22</name>
+      <text>Enable Callbacks</text>
+      <y>2</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_4</name>
+      <pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
+      <x>300</x>
+      <y>2</y>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TextUpdate_15</name>
+      <pv_name>$(P)$(R)PvName_RBV</pv_name>
+      <x>155</x>
+      <y>27</y>
+      <width>205</width>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <format>6</format>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_23</name>
+      <text>Pv Name</text>
+      <y>27</y>
+      <width>150</width>
+      <tooltip>$(text)</tooltip>
+    </widget>
+  </widget>
+  <widget type="image" version="2.0.0">
+    <name>Image</name>
+    <pv_name>pva://BL01T-DI-CAM-01:PVA:OUTPUT</pv_name>
+    <x>820</x>
+    <y>8</y>
+    <width>772</width>
+    <height>760</height>
+    <color_bar>
+      <visible>false</visible>
+      <bar_size>40</bar_size>
+      <scale_font>
+        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        </font>
+      </scale_font>
+    </color_bar>
+    <x_axis>
+      <visible>false</visible>
+      <title>SimDetector Image</title>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <title_font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        </font>
+      </scale_font>
+    </x_axis>
+    <y_axis>
+      <visible>false</visible>
+      <title>Y</title>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <title_font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        </font>
+      </scale_font>
+    </y_axis>
+  </widget>
 </display>
diff --git a/services/bl01t-di-cam-01/compose.yml b/services/bl01t-di-cam-01/compose.yml
index 833060f..f0a764d 100644
--- a/services/bl01t-di-cam-01/compose.yml
+++ b/services/bl01t-di-cam-01/compose.yml
@@ -9,8 +9,6 @@ services:
     image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.6.1
 
     labels:
-      # this should be incremented when changes are made to this file
-      # (TODO: can we enforce/automate this?)
       version: 0.1.0
 
     environment:
@@ -19,7 +17,7 @@ services:
       IOC_PREFIX: BL01T-DI-CAM-01
 
     volumes:
-      - ../opi/bl01t-di-cam-01:/epics/opi
+      - ../../opi/iocs/bl01t-di-cam-01:/epics/opi
 
     configs:
       - source: bl01t-di-cam-01_config
@@ -30,5 +28,5 @@ configs:
     file: ./config
 
 include:
-  - include/networks.yml
-  - include/volumes.yml
+  - path:
+    - include/networks.yml
diff --git a/services/bl01t-di-cam-01/config/ioc.yaml b/services/bl01t-di-cam-01/config/ioc.yaml
index 0cb30fc..04d1ab5 100644
--- a/services/bl01t-di-cam-01/config/ioc.yaml
+++ b/services/bl01t-di-cam-01/config/ioc.yaml
@@ -6,12 +6,12 @@ description: Example simulated camera for BL01T
 entities:
   - type: ADSimDetector.simDetector
     PORT: DET.DET
-    P: BL01T-EA-TST-01
+    P: BL01T-DI-CAM-01
     R: ":DET:"
 
   - type: ADCore.NDPvaPlugin
     PORT: DET.PVA
-    PVNAME: BL01T-EA-TST-01:PVA:OUTPUT
-    P: BL01T-EA-TST-01
+    PVNAME: BL01T-DI-CAM-01:PVA:OUTPUT
+    P: BL01T-DI-CAM-01
     R: ":PVA:"
     NDARRAY_PORT: DET.DET
diff --git a/services/bl01t-ea-test-01/compose.yml b/services/bl01t-ea-test-01/compose.yml
index b1b687f..681d3cf 100644
--- a/services/bl01t-ea-test-01/compose.yml
+++ b/services/bl01t-ea-test-01/compose.yml
@@ -17,7 +17,7 @@ services:
       IOC_PREFIX: BL01T-EA-TEST-01
 
     volumes:
-      - ../opi/bl01t-ea-test-01:/epics/opi
+      - ../../opi/iocs/bl01t-ea-test-01:/epics/opi
 
     configs:
       - source: bl01t-ea-test-01_config
@@ -28,5 +28,5 @@ configs:
     file: ./config
 
 include:
-  - include/networks.yml
-  - include/volumes.yml
+  - path:
+      include/networks.yml
diff --git a/services/phoebus/compose.yml b/services/phoebus/compose.yml
index d97e221..ba839ad 100644
--- a/services/phoebus/compose.yml
+++ b/services/phoebus/compose.yml
@@ -12,7 +12,7 @@ services:
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
       - ~/.Xauthority:/root/.Xauthority
-      - ../opi:/opi
+      - ../../opi:/opi
     # for X11 to work we need to run as the same UID as the host
     # IMPORTANT: set UIDGID to your host user:group e.g. 1000:1000
     # BUT: always to 0:0 if you are using podman