diff --git a/Dockerfile b/Dockerfile
index b954101..7f769f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,8 +47,12 @@ RUN motor/install.sh R7-3-1
 COPY ibek-support/motorMotorSim/ motorMotorSim/
 RUN motorMotorSim/install.sh R1-2
 
-# create IOC source tree, generate Makefile and compile IOC Instance
-RUN ibek ioc build
+# get the ioc source and build it
+COPY ioc ${SOURCE_FOLDER}/ioc
+RUN cd ${IOC} && ./install.sh && make
+
+# install runtime proxy for non-native builds
+RUN bash ${IOC}/install_proxy.sh
 
 ##### runtime preparation stage ################################################
 FROM developer AS runtime_prep
diff --git a/ibek-support b/ibek-support
index 9191f84..cc8df48 160000
--- a/ibek-support
+++ b/ibek-support
@@ -1 +1 @@
-Subproject commit 9191f840818e19ce1f85dce7116457c5434b4cad
+Subproject commit cc8df489c224e6628696b6aac7fa46760e864b93