diff --git a/.gitignore b/.gitignore
index 09bb8d682a..62429a07af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,6 +101,7 @@ test-output/*/*
 *.log
 
 .env*
+*.env
 
 /test-output
 
diff --git a/admin/package.json b/admin/package.json
index 3a53d14b7a..578e7a0067 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -29,7 +29,7 @@
     "watch:integration": "yarn jest --watch --coverage=no --config ./tests-integration/jest.integration.config.js"
   },
   "mtc": {
-    "assets-version": "e93c2fae4e22b00c9e51494b9880f452"
+    "assets-version": "41e081a4cc897a5542bd9223d2e114c7"
   },
   "engines": {
     "node": ">= 12"
diff --git a/func-consumption/.gitignore b/func-consumption/.gitignore
index fc655ce0bf..f817c7320e 100644
--- a/func-consumption/.gitignore
+++ b/func-consumption/.gitignore
@@ -44,5 +44,3 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-# azure functions auto generated binding extensions project file
-/extensions.csproj
diff --git a/func-consumption/host.json b/func-consumption/host.json
index cc75713556..9a53001779 100644
--- a/func-consumption/host.json
+++ b/func-consumption/host.json
@@ -26,5 +26,9 @@
         "X-DNS-Prefetch-Control": "off"
       }
     }
+  },
+  "extensionBundle": {
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
+    "version": "[2.*, 3.0.0)"
   }
 }
diff --git a/func-consumption/package.json b/func-consumption/package.json
index 7254678560..04d45a1ee4 100644
--- a/func-consumption/package.json
+++ b/func-consumption/package.json
@@ -7,7 +7,7 @@
     "node": ">= 10.14.1"
   },
   "scripts": {
-    "build": "yarn sync && yarn run gulp && func extensions install",
+    "build": "yarn sync && yarn run gulp",
     "prod:clean": "rm -rf ./node_modules && yarn install --frozen-lockfile --production",
     "rebuild": "yarn clean && yarn build",
     "sync": "node ./sync-tslib-deps.js && yarn install",
diff --git a/func-throttled/.gitignore b/func-throttled/.gitignore
index 5c65ef0fbc..f817c7320e 100644
--- a/func-throttled/.gitignore
+++ b/func-throttled/.gitignore
@@ -4,7 +4,6 @@ csx
 .vs
 edge
 Publish
-extensions.csproj
 
 *.user
 *.suo
@@ -45,5 +44,3 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-# azure functions auto generated binding extensions project file
-/extensions.csproj
diff --git a/func-throttled/host.json b/func-throttled/host.json
index 59351d3167..5ae88fc8d9 100644
--- a/func-throttled/host.json
+++ b/func-throttled/host.json
@@ -30,16 +30,20 @@
     "serviceBus": {
       "prefetchCount": 100,
       "messageHandlerOptions": {
-          "autoComplete": true,
-          "maxConcurrentCalls": 1,
-          "maxAutoRenewDuration": "00:05:00"
+        "autoComplete": true,
+        "maxConcurrentCalls": 1,
+        "maxAutoRenewDuration": "00:05:00"
       },
       "sessionHandlerOptions": {
-          "autoComplete": false,
-          "messageWaitTimeout": "00:00:30",
-          "maxAutoRenewDuration": "00:55:00",
-          "maxConcurrentSessions": 16
+        "autoComplete": false,
+        "messageWaitTimeout": "00:00:30",
+        "maxAutoRenewDuration": "00:55:00",
+        "maxConcurrentSessions": 16
       }
-  }
+    }
+  },
+  "extensionBundle": {
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
+    "version": "[2.*, 3.0.0)"
   }
 }
diff --git a/func-throttled/package.json b/func-throttled/package.json
index 4754ff2a25..35f5158281 100644
--- a/func-throttled/package.json
+++ b/func-throttled/package.json
@@ -7,7 +7,7 @@
     "node": ">= 10.14.1"
   },
   "scripts": {
-    "build": "yarn sync && yarn run gulp && func extensions install",
+    "build": "yarn sync && yarn run gulp",
     "prod:clean": "rm -rf ./node_modules && yarn install --frozen-lockfile --production",
     "rebuild": "yarn clean && yarn build",
     "sync": "node ./sync-tslib-deps.js && yarn install",
diff --git a/pupil-spa/gulpfile.js b/pupil-spa/gulpfile.js
index 782488a6a6..7c974f55a8 100644
--- a/pupil-spa/gulpfile.js
+++ b/pupil-spa/gulpfile.js
@@ -26,7 +26,7 @@ gulp.task('setRuntimeConfigURL', () => {
 })
 
 gulp.task('setSecretEnvVars', () => {
-  return gulp.src('src/public/config.json', { base: './' })
+  return gulp.src('src/assets/config.json', { base: './' })
     .pipe(replace('testPupilConnectionQueueUrlValue', process.env.TEST_PUPIL_CONNECTION_QUEUE_URL || ''))
     .pipe(replace('testPupilConnectionQueueTokenValue', process.env.TEST_PUPIL_CONNECTION_QUEUE_TOKEN || ''))
     .pipe(gulp.dest('./'))
diff --git a/restart.sh b/restart.sh
index ab7d85b767..8ee771fa92 100755
--- a/restart.sh
+++ b/restart.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
+set -e
 # Stop and start the MTC infrastructure in a new docker container with a fresh DB and purged queues
 
 echo "Restarting all infrastructure"
 scriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-${scriptDir}/stop.sh && ${scriptDir}/start.sh
+${scriptDir}/stop.sh
+${scriptDir}/start.sh
diff --git a/setup.sh b/setup.sh
index bbbe4fb913..aef83c0f40 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -eu
+#!/usr/bin/env bash
+set -eu
 
 scriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 currentDir=`pwd`