diff --git a/citrineos/build-and-run.sh b/citrineos/build-and-run.sh
index 9b6126ab..5d9d55ab 100644
--- a/citrineos/build-and-run.sh
+++ b/citrineos/build-and-run.sh
@@ -1,5 +1,8 @@
 echo "Build and run"
 
+echo "CitrineOS does not currently build due to issues with npm dependencies. It is disabled until we roll forward. Apologies for the inconvenience!"
+exit 1
+
 pushd Server || exit 1
 
 docker compose build
diff --git a/demo-iso15118-2-ocpp-201.sh b/demo-iso15118-2-ocpp-201.sh
index 2195c5d9..bdfb629c 100755
--- a/demo-iso15118-2-ocpp-201.sh
+++ b/demo-iso15118-2-ocpp-201.sh
@@ -158,10 +158,14 @@ if [[ "$DEMO_VERSION" =~ sp1 ]]; then
 echo "Copying device DB, configured to SecurityProfile: 1"
 docker cp manager/device_model_storage_${DEMO_CSMS}_sp1.db \
   everest-ac-demo-manager-1:/ext/source/build/dist/share/everest/modules/OCPP201/device_model_storage.db
+docker cp manager/disable_iso_tls.patch everest-ac-demo-manager-1:/tmp/
+docker exec everest-ac-demo-manager-1 /bin/bash -c "pushd /ext/source && patch -p0 -i /tmp/disable_iso_tls.patch"
 elif [[ "$DEMO_VERSION" =~ sp2 ]]; then
 echo "Copying device DB, configured to SecurityProfile: 2"
 docker cp manager/device_model_storage_${DEMO_CSMS}_sp2.db \
   everest-ac-demo-manager-1:/ext/source/build/dist/share/everest/modules/OCPP201/device_model_storage.db
+docker cp manager/disable_iso_tls.patch everest-ac-demo-manager-1:/tmp/
+docker exec everest-ac-demo-manager-1 /bin/bash -c "pushd /ext/source && patch -p0 -i /tmp/disable_iso_tls.patch"
 elif [[ "$DEMO_VERSION" =~ sp3 ]]; then
 echo "Copying device DB, configured to SecurityProfile: 3"
 docker cp manager/device_model_storage_${DEMO_CSMS}_sp3.db \
diff --git a/manager/disable_iso_tls.patch b/manager/disable_iso_tls.patch
new file mode 100644
index 00000000..2db455d9
--- /dev/null
+++ b/manager/disable_iso_tls.patch
@@ -0,0 +1,11 @@
+--- /tmp/config-sil-ocpp201-pnc.yaml
++++ config/config-sil-ocpp201-pnc.yaml
+@@ -14,7 +14,7 @@
+     config_module:
+       device: auto
+       supported_ISO15118_2: true
+-      tls_active: true
++      tls_active: false
+       is_cert_install_needed: false
+   evse_manager_1:
+     module: EvseManager