diff --git a/.run/DESIGNER.run.xml b/.run/DESIGNER No AUTH.run.xml
similarity index 92%
rename from .run/DESIGNER.run.xml
rename to .run/DESIGNER No AUTH.run.xml
index e342ce6..44a165b 100644
--- a/.run/DESIGNER.run.xml
+++ b/.run/DESIGNER No AUTH.run.xml	
@@ -11,7 +11,7 @@
       <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement" />
       <env name="ALLOW_USER_TEMPLATES" value="true" />
       <env name="AUTH_COOKIE_NAME" value="fsd_user_token" />
-      <env name="AUTH_ENABLED" value="true" />
+      <env name="AUTH_ENABLED" value="false" />
       <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" />
       <env name="AWS_BUCKET_NAME" value="fsd-bucket" />
       <env name="AWS_DEFAULT_REGION" value="eu-west-2" />
@@ -30,8 +30,6 @@
       <env name="REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out" />
       <env name="RSA256_PUBLIC_KEY_BASE64" value="&quot;LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHZU1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTUFEQ0JpQUtCZ0hHYnRGMXlWR1crckNBRk9JZGFrVVZ3Q2Z1dgp4SEUzOGxFL2kwS1dwTXdkU0haRkZMWW5IakJWT09oMTVFaWl6WXphNEZUSlRNdkwyRTRRckxwcVlqNktFNnR2CkhyaHlQL041ZnlwU3p0OHZDajlzcFo4KzBrRnVjVzl6eU1rUHVEaXNZdG1rV0dkeEJta2QzZ3RZcDNtT0k1M1YKVkRnS2J0b0lGVTNzSWs1TkFnTUJBQUU9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQ\=\=&quot;" />
       <env name="SERVICE_START_PAGE" value="http://localhost:3008/account" />
-        <env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/>
-        <env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/>
     </envs>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
@@ -46,4 +44,4 @@
       </option>
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.run/DOCKER-DEBUG.run.xml b/.run/DOCKER-DEBUG.run.xml
deleted file mode 100644
index 638256f..0000000
--- a/.run/DOCKER-DEBUG.run.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DOCKER-DEBUG" type="ChromiumRemoteDebugType" factoryName="Chromium Remote" port="9228" restartOnDisconnect="true">
-    <mapping url="/usr/src/app/digital-form-builder-adapter/runner" local-file="$PROJECT_DIR$/runner" />
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/.run/RUNNER  TEST.run.xml b/.run/RUNNER  TEST.run.xml
new file mode 100644
index 0000000..af76646
--- /dev/null
+++ b/.run/RUNNER  TEST.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="RUNNER  TEST" type="js.build_tools.npm">
+        <package-json value="$PROJECT_DIR$/package.json"/>
+        <command value="run"/>
+        <scripts>
+            <script value="runner"/>
+        </scripts>
+        <arguments value="unit-test-cov"/>
+        <node-interpreter value="project"/>
+        <envs/>
+        <method v="2">
+            <option name="NpmBeforeRunTask" enabled="true">
+                <package-json value="$PROJECT_DIR$/package.json"/>
+                <command value="run"/>
+                <scripts>
+                    <script value="runner"/>
+                </scripts>
+                <arguments value="build"/>
+                <node-interpreter value="project"/>
+                <envs/>
+            </option>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/RUNNER No AUTH NO REDIS.run.xml b/.run/RUNNER No AUTH NO REDIS.run.xml
new file mode 100644
index 0000000..76c63f6
--- /dev/null
+++ b/.run/RUNNER No AUTH NO REDIS.run.xml	
@@ -0,0 +1,49 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="RUNNER No AUTH NO REDIS" type="js.build_tools.npm">
+        <package-json value="$PROJECT_DIR$/package.json"/>
+        <command value="run"/>
+        <scripts>
+            <script value="runner"/>
+        </scripts>
+        <arguments value="dev"/>
+        <node-interpreter value="project"/>
+        <envs>
+            <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/>
+            <env name="ALLOW_USER_TEMPLATES" value="true"/>
+            <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/>
+            <env name="AWS_BUCKET_NAME" value="fsd-bucket"/>
+            <env name="AWS_DEFAULT_REGION" value="eu-west-2"/>
+            <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/>
+            <env name="AWS_REGION" value="eu-west-2"/>
+            <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/>
+            <env name="AWS_SIGNATURE_VERSION" value="v4"/>
+            <env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/>
+            <env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/>
+            <env name="E2E_MODE_ENABLED" value="false"/>
+            <env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/>
+            <env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/>
+            <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/>
+            <env name="JWT_AUTH_ENABLED" value="false"/>
+            <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/>
+            <env name="LOG_LEVEL" value="debug"/>
+            <env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/>
+            <env name="MULTIFUND_URL" value="http://localhost:3008/account"/>
+            <env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/>
+            <env name="RSA256_PUBLIC_KEY_BASE64"
+                 value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/>
+            <env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/>
+        </envs>
+        <method v="2">
+            <option name="NpmBeforeRunTask" enabled="true">
+                <package-json value="$PROJECT_DIR$/package.json"/>
+                <command value="run"/>
+                <scripts>
+                    <script value="runner"/>
+                </scripts>
+                <arguments value="build"/>
+                <node-interpreter value="project"/>
+                <envs/>
+            </option>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/RUNNER No AUTH.run.xml b/.run/RUNNER No AUTH.run.xml
new file mode 100644
index 0000000..8185a15
--- /dev/null
+++ b/.run/RUNNER No AUTH.run.xml	
@@ -0,0 +1,51 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RUNNER No AUTH" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="runner" />
+    </scripts>
+    <arguments value="dev" />
+    <node-interpreter value="project" />
+    <envs>
+      <env name="ACCESSIBILITY_STATEMENT_URL" value="https://frontend.levellingup.gov.localhost:3008/accessibility_statement" />
+      <env name="ALLOW_USER_TEMPLATES" value="true" />
+      <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" />
+      <env name="AWS_BUCKET_NAME" value="fsd-bucket" />
+      <env name="AWS_DEFAULT_REGION" value="eu-west-2" />
+      <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566" />
+      <env name="AWS_REGION" value="eu-west-2" />
+      <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" />
+      <env name="AWS_SIGNATURE_VERSION" value="v4" />
+      <env name="CONTACT_US_URL" value="https://frontend.levellingup.gov.localhost:3008/contact_us" />
+      <env name="COOKIE_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/cookie_policy" />
+      <env name="E2E_MODE_ENABLED" value="false" />
+      <env name="ELIGIBILITY_RESULT_URL" value="https://frontend.levellingup.gov.localhost:3008/eligibility-result" />
+      <env name="FEEDBACK_LINK" value="https://frontend.levellingup.gov.localhost:3008/feedback" />
+      <env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379" />
+      <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token" />
+      <env name="JWT_AUTH_ENABLED" value="false" />
+      <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" />
+      <env name="LOG_LEVEL" value="debug" />
+      <env name="LOGOUT_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" />
+      <env name="MULTIFUND_URL" value="https://frontend.levellingup.gov.localhost:3008/account" />
+      <env name="PREVIEW_MODE" value="true" />
+      <env name="PRIVACY_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/privacy" />
+      <env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" />
+      <env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" />
+      <env name="SINGLE_REDIS" value="true" />
+    </envs>
+    <method v="2">
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="runner" />
+        </scripts>
+        <arguments value="build" />
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+    </method>
+  </configuration>
+</component>
diff --git a/.run/RUNNER-prod mode.run.xml b/.run/RUNNER-prod mode.run.xml
new file mode 100644
index 0000000..3c29b6e
--- /dev/null
+++ b/.run/RUNNER-prod mode.run.xml	
@@ -0,0 +1,52 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="RUNNER-prod mode" type="js.build_tools.npm">
+        <package-json value="$PROJECT_DIR$/package.json"/>
+        <command value="run"/>
+        <scripts>
+            <script value="runner"/>
+        </scripts>
+        <arguments value="dev"/>
+        <node-interpreter value="project"/>
+        <envs>
+            <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/>
+            <env name="ALLOW_USER_TEMPLATES" value="true"/>
+            <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/>
+            <env name="AWS_BUCKET_NAME" value="fsd-bucket"/>
+            <env name="AWS_DEFAULT_REGION" value="eu-west-2"/>
+            <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/>
+            <env name="AWS_REGION" value="eu-west-2"/>
+            <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/>
+            <env name="AWS_SIGNATURE_VERSION" value="v4"/>
+            <env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/>
+            <env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/>
+            <env name="E2E_MODE_ENABLED" value="false"/>
+            <env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/>
+            <env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/>
+            <env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379"/>
+            <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/>
+            <env name="JWT_AUTH_ENABLED" value="true"/>
+            <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/>
+            <env name="LOG_LEVEL" value="debug"/>
+            <env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/>
+            <env name="MULTIFUND_URL" value="http://localhost:3008/account"/>
+            <env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/>
+            <env name="RSA256_PUBLIC_KEY_BASE64"
+                 value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/>
+            <env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/>
+            <env name="SINGLE_REDIS" value="true"/>
+            <env name="PREVIEW_MODE" value="false"/>
+        </envs>
+        <method v="2">
+            <option name="NpmBeforeRunTask" enabled="true">
+                <package-json value="$PROJECT_DIR$/package.json"/>
+                <command value="run"/>
+                <scripts>
+                    <script value="runner"/>
+                </scripts>
+                <arguments value="build"/>
+                <node-interpreter value="project"/>
+                <envs/>
+            </option>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/RUNNER.run.xml b/.run/RUNNER.run.xml
index 8628d84..001ef91 100644
--- a/.run/RUNNER.run.xml
+++ b/.run/RUNNER.run.xml
@@ -34,8 +34,6 @@
       <env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" />
       <env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" />
       <env name="SINGLE_REDIS" value="true" />
-        <env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/>
-        <env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/>
     </envs>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
diff --git a/designer/package.json b/designer/package.json
index 4943068..08fa238 100644
--- a/designer/package.json
+++ b/designer/package.json
@@ -5,11 +5,10 @@
   "scripts": {
     "watch": "NODE_ENV=development webpack",
     "dev": "NODE_OPTIONS=--openssl-legacy-provider && concurrently 'yarn watch' 'yarn start:local'",
-    "production": "NODE_ENV=production yarn start:server",
-    "start:test": "NODE_ENV=test yarn start:server",
+    "production": "yarn start:prod",
     "build": "NODE_ENV=production && NODE_OPTIONS=--openssl-legacy-provider && webpack",
-    "start:server": "node dist/server.js",
-    "start:local": "NODE_ENV=development PERSISTENT_BACKEND=preview ts-node-dev --inspect=0.0.0.0:9229 --respawn --transpile-only server/index.ts"
+    "start:prod": "NODE_ENV=production nodemon dist/server.js",
+    "start:local": "NODE_ENV=development PERSISTENT_BACKEND=preview ts-node-dev --inspect --respawn --transpile-only server/index.ts"
   },
   "author": "Communities UK",
   "license": "SEE LICENSE IN LICENSE",
diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml
index 5914a37..6908855 100644
--- a/docker-compose.e2e.yml
+++ b/docker-compose.e2e.yml
@@ -13,7 +13,7 @@ services:
       - LAST_COMMIT
       - LAST_TAG
       - AUTH_ENABLED=false
-    command: yarn designer start:test
+    command: yarn designer production
     depends_on:
       - runner
       - localstack
@@ -44,7 +44,7 @@ services:
       - SINGLE_REDIS=true
       - FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI=redis://redis-data:6379
       - PREVIEW_MODE=true
-    command: yarn runner start:test
+    command: yarn runner production
     logging:
       driver: "json-file"
     depends_on:
diff --git a/runner/package.json b/runner/package.json
index 3ffb39d..a92ef6f 100644
--- a/runner/package.json
+++ b/runner/package.json
@@ -11,10 +11,8 @@
     "scss:build": "node compile-scss.js",
     "copy-forms": "node copy-form-json.js",
     "clean:build": "rm -rf dist",
-    "dev": "NODE_ENV=development nodemon --watch src --ext js,json,ts,html,scss --exec 'yarn build && node --inspect=0.0.0.0:9228 dist/digital-form-builder-adapter/runner/index.js'",
-    "start:server": "node dist/digital-form-builder-adapter/runner/index.js",
-    "production": "NODE_ENV=production npm run start:server",
-    "start:test": "NODE_ENV=development npm run start:server",
+    "dev": "NODE_ENV=development  nodemon dist/digital-form-builder-adapter/runner/index.js",
+    "production": "NODE_ENV=development nodemon dist/digital-form-builder-adapter/runner/index.js",
     "test-cov": "yarn run unit-test-cov",
     "test:dev": "lab -T test/.transform.js -P (test|src)/**/*.test.* -v test --coverage-exclude",
     "unit-test": "lab -T test/.transform.js -P (test|src)/**/*.test.* -v test -S -v -r console -o stdout -r html -o unit-test.html -I version -l",