diff --git a/.eslintrc b/.eslintrc
index 52083e88..c11535cc 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -47,6 +47,7 @@
     "no-angle-bracket-type-assertion": 0,
     "no-bitwise": 1,
     "no-console": 1,
+    "no-tabs": 1,
     "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 0, "maxBOF": 0 }],
     "no-empty": [1, { "allowEmptyCatch": true }],
     "no-empty-interface": 0,
diff --git a/controller/acceptance/healthcheck.spec.ts b/controller/acceptance/healthcheck.spec.ts
index da610b86..1f5f0f28 100644
--- a/controller/acceptance/healthcheck.spec.ts
+++ b/controller/acceptance/healthcheck.spec.ts
@@ -5,7 +5,7 @@ import { expect } from "chai";
 
 const fetch = _axios.get;
 
-// Beanstalk	<SYSTEM_NAME>_<SERVICE_NAME>_URL
+// Beanstalk <SYSTEM_NAME>_<SERVICE_NAME>_URL
 const integrationUrl = "http://" + (process.env.BUILD_APP_URL || `localhost:${process.env.PORT || "8081"}`);
 
 describe("Healthcheck Integration", () => {
diff --git a/controller/acceptance/pewpew.spec.ts b/controller/acceptance/pewpew.spec.ts
index 04029f4b..896df38b 100644
--- a/controller/acceptance/pewpew.spec.ts
+++ b/controller/acceptance/pewpew.spec.ts
@@ -38,7 +38,7 @@ async function fetch (
 const UNIT_TEST_FOLDER = process.env.UNIT_TEST_FOLDER || "test";
 const PEWPEW_ZIP_FILEPATH = process.env.PEWPEW_ZIP_FILEPATH || path.join(UNIT_TEST_FOLDER, PEWPEW_BINARY_EXECUTABLE + ".zip");
 
-// Beanstalk	<SYSTEM_NAME>_<SERVICE_NAME>_URL
+// Beanstalk <SYSTEM_NAME>_<SERVICE_NAME>_URL
 const integrationUrl = "http://" + (process.env.BUILD_APP_URL || `localhost:${process.env.PORT || "8081"}`);
 
 let sharedPewPewVersions: string[] | undefined;
diff --git a/controller/acceptance/queues.spec.ts b/controller/acceptance/queues.spec.ts
index c8fb0e39..18b90fed 100644
--- a/controller/acceptance/queues.spec.ts
+++ b/controller/acceptance/queues.spec.ts
@@ -8,7 +8,7 @@ import { expect } from "chai";
 
 const fetch = _axios.get;
 
-// Beanstalk	<SYSTEM_NAME>_<SERVICE_NAME>_URL
+// Beanstalk <SYSTEM_NAME>_<SERVICE_NAME>_URL
 const integrationUrl = "http://" + (process.env.BUILD_APP_URL || `localhost:${process.env.PORT || "8081"}`);
 
 let sharedQueueNames: string[] | undefined;
diff --git a/controller/acceptance/test.spec.ts b/controller/acceptance/test.spec.ts
index 0f135330..41f64447 100644
--- a/controller/acceptance/test.spec.ts
+++ b/controller/acceptance/test.spec.ts
@@ -63,7 +63,7 @@ const defaultEnvironmentVariables: EnvironmentVariablesFile = {
   TEST2: "true"
 };
 
-// Beanstalk	<SYSTEM_NAME>_<SERVICE_NAME>_URL
+// Beanstalk <SYSTEM_NAME>_<SERVICE_NAME>_URL
 export const integrationUrl = "http://" + (process.env.BUILD_APP_URL || `localhost:${process.env.PORT || "8081"}`);
 
 let sharedPpaasTestId: PpaasTestId | undefined;
diff --git a/controller/components/YamlWriterUpload/index.tsx b/controller/components/YamlWriterUpload/index.tsx
index 0bcebe64..1834b9af 100644
--- a/controller/components/YamlWriterUpload/index.tsx
+++ b/controller/components/YamlWriterUpload/index.tsx
@@ -281,7 +281,7 @@ export const YamlWriterUpload = (props: YamlWriterUploadProps) => {
       if (types[mimeType] !== undefined) {
         types[mimeType]!.index.push({ iter: i, id });
       } else {
-				types[mimeType] = { index: [{ iter: i, id }], selected: "partial"};
+        types[mimeType] = { index: [{ iter: i, id }], selected: "partial"};
       }
 
       // Adds a reference to an endpoint with given response type
@@ -292,7 +292,7 @@ export const YamlWriterUpload = (props: YamlWriterUploadProps) => {
       } else {
         urls[hostUrl] = { index: [{ iter: i, id }], selected: "yes"};
       }
-			endpoints.push({ selected: "yes", url, type: mimeType, id, method: entry.request.method, headers: [...entry.request.headers] });
+      endpoints.push({ selected: "yes", url, type: mimeType, id, method: entry.request.method, headers: [...entry.request.headers] });
     }
 
     const typesTemp = types;
diff --git a/guide/results-viewer-react/.eslintrc b/guide/results-viewer-react/.eslintrc
index b35016bd..969ee8a8 100644
--- a/guide/results-viewer-react/.eslintrc
+++ b/guide/results-viewer-react/.eslintrc
@@ -34,6 +34,7 @@
     "no-angle-bracket-type-assertion": 0,
     "no-bitwise": 1,
     "no-console": 1,
+    "no-tabs": 1,
     "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 0, "maxBOF": 0 }],
     "no-empty": [1, { "allowEmptyCatch": true }],
     "no-empty-interface": 0,
diff --git a/guide/results-viewer-react/src/components/YamlWriterUpload/index.tsx b/guide/results-viewer-react/src/components/YamlWriterUpload/index.tsx
index bb3f4527..5ba48cc3 100644
--- a/guide/results-viewer-react/src/components/YamlWriterUpload/index.tsx
+++ b/guide/results-viewer-react/src/components/YamlWriterUpload/index.tsx
@@ -280,7 +280,7 @@ export const YamlWriterUpload = (props: YamlWriterUploadProps) => {
       if (types[mimeType] !== undefined) {
         types[mimeType]!.index.push({ iter: i, id });
       } else {
-				types[mimeType] = { index: [{ iter: i, id }], selected: "partial"};
+        types[mimeType] = { index: [{ iter: i, id }], selected: "partial"};
       }
 
       // Adds a reference to an endpoint with given response type
@@ -291,7 +291,7 @@ export const YamlWriterUpload = (props: YamlWriterUploadProps) => {
       } else {
         urls[hostUrl] = { index: [{ iter: i, id }], selected: "yes"};
       }
-			endpoints.push({ selected: "yes", url, type: mimeType, id, method: entry.request.method, headers: [...entry.request.headers] });
+      endpoints.push({ selected: "yes", url, type: mimeType, id, method: entry.request.method, headers: [...entry.request.headers] });
     }
 
     const typesTemp = types;