diff --git a/site_ansto/instrument/sans/quokka_configuration.tcl b/site_ansto/instrument/sans/quokka_configuration.tcl
index 04bc3a6d..55e7216c 100644
--- a/site_ansto/instrument/sans/quokka_configuration.tcl
+++ b/site_ansto/instrument/sans/quokka_configuration.tcl
@@ -25,8 +25,8 @@ fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(optics)/optics.tcl
 fileeval $cfPath(counter)/counter.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
+fileeval $cfPath(environment)/temperature/lakeshore340.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(hmm)/detector.tcl
@@ -34,9 +34,9 @@ fileeval $cfPath(scan)/scan.tcl
 fileeval $cfPath(commands)/commands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
 fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
-fileeval $cfPath(environment)/magneticField/sct_oxford_ips.tcl
 fileeval $cfPath(environment)/environment.tcl
 fileeval $cfPath(beamline)/spin_flipper.tcl
+fileeval $cfPath(goniometer)/spin_goniometer.tcl
 source gumxml.tcl
 
 ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index 813c19e0..f4cd450b 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -33,6 +33,9 @@ plc_simulation false
 VarMake rfgen_simulation Text internal
 rfgen_simulation false
 
+VarMake goniometer_simulation Text internal
+goniometer_simulation false
+
 VarMake sics_fullsimulation Text internal
 
 source util/utility.tcl
@@ -80,6 +83,7 @@ if {[string trim [lindex [split [sics_fullsimulation] =] 1]] == "true"} {
   velsel_simulation true
   plc_simulation true
   rfgen_simulation true
+  goniometer_simulation true
 }
 
 set cfParent config 
@@ -102,6 +106,7 @@ hipadaba      $cfParent/hipadaba\
 plc           $cfParent/plc\
 commands      $cfParent/commands\
 beamline      $cfParent/beamline\
+goniometer    $cfParent/goniometer\
 ]
 
 ServerOption LogFileBaseName $sicsroot/log/serverlog