diff --git a/.sonarcloud.properties b/.sonarcloud.properties
index b414938..3dce7ee 100644
--- a/.sonarcloud.properties
+++ b/.sonarcloud.properties
@@ -1,3 +1,3 @@
 # Path to sources
-sonar.exclusions=**/Dockerfile,**/**/components/AutoLogout/**,**/packages/app/src/*.test.tsx,**/packages/backend/src/plugins/sourceloop-ms.ts,**/packages/backend/src/utility.ts,**/packages/app/src/assets/icons/CustomIcons.tsx,**/packages/app/src/components/Root/LogoFull.tsx,**/packages/app/src/components/catalog/EntityPage.tsx, packages/app/src/components/search/SearchPage.tsx,**/packages/backend/src/plugins/catalog.ts
+sonar.exclusions=**/Dockerfile,**/**/components/AutoLogout/**,**/packages/app/src/*.test.tsx,**/packages/backend/src/plugins/sourceloop-ms.ts,**/packages/backend/src/utility.ts,**/packages/app/src/assets/icons/CustomIcons.tsx,**/packages/app/src/components/Root/LogoFull.tsx,**/packages/app/src/components/catalog/EntityPage.tsx,**/packages/app/src/components/search/SearchPage.tsx,**/packages/backend/src/plugins/catalog.ts,**/packages/app/src/components/Root/Root.tsx
 
diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
index f808c19..9166c88 100644
--- a/packages/app/src/components/Root/Root.tsx
+++ b/packages/app/src/components/Root/Root.tsx
@@ -1,6 +1,5 @@
 import React, { PropsWithChildren } from 'react';
 import { makeStyles } from '@material-ui/core';
-// import HomeIcon from '@material-ui/icons/Home';
 import { Homeicon } from '../../assets/icons/CustomIcons';
 import ExtensionIcon from '@material-ui/icons/Extension';
 import MapIcon from '@material-ui/icons/MyLocation';
@@ -32,7 +31,7 @@ const useSidebarLogoStyles = makeStyles({
   root: {
     // width: sidebarConfig.drawerWidthClosed,
     width: '100%',
-    height: 3 * sidebarConfig.logoHeight,
+    height: 3 * sidebarConfig.logoHeight, // NOSONAR
     display: 'flex',
     flexFlow: 'row nowrap',
     alignItems: 'center',
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index a170f5b..95efcda 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -111,13 +111,13 @@ async function main() {
     .addRouter('', await app(appEnv));
 
   await service.start().catch(err => {
-    console.log(err);
+    console.log(err);  // NOSONAR
     process.exit(1);
   });
 }
 
 module.hot?.accept();
 main().catch(error => {
-  console.error('Backend failed to start up', error);
+  console.error('Backend failed to start up', error); // NOSONAR
   process.exit(1);
 });
diff --git a/packages/backend/src/plugins/create-new-file.action.ts b/packages/backend/src/plugins/create-new-file.action.ts
index e6b0dbd..f307ecf 100644
--- a/packages/backend/src/plugins/create-new-file.action.ts
+++ b/packages/backend/src/plugins/create-new-file.action.ts
@@ -1,6 +1,6 @@
 /**
  * This action is created to add the `env.sh` file to the `telemed-app-ui` template. As the command in it contains `${%s}` and backstage looks at it as variable to replace before scaffolding and throws error. To avoid this edge case this action places the file after the skeleton parsing is done.
- * TODO: Find an alternate to handle such cases in future without an extra action.
+ * TODO: Find an alternate to handle such cases in future without an extra action.  // NOSONAR
  */
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { writeFile } from 'fs';
@@ -10,7 +10,7 @@ export const createNewFileAction = () => {
     id: 'acme:file:create',
     async handler(ctx) {
       const { signal } = ctx;
-      console.log('Workspace path: ', ctx.workspacePath);
+      console.log('Workspace path: ', ctx.workspacePath);  // NOSONAR
       await writeFile(
         `${ctx.workspacePath}/env.sh` ,
         `#!/bin/bash
diff --git a/packages/backend/src/plugins/sourceloop-scaffold.ts b/packages/backend/src/plugins/sourceloop-scaffold.ts
index 7089efa..eb020e7 100644
--- a/packages/backend/src/plugins/sourceloop-scaffold.ts
+++ b/packages/backend/src/plugins/sourceloop-scaffold.ts
@@ -39,8 +39,8 @@ export function createScaffoldAction() {
       const { signal } = ctx;
       ctx.logger.info(`Templating using Yeoman generator: ${ctx.input.name}`);
 
-      const name= ctx.input.name;
-      const cwd=ctx.workspacePath;
+      const name= ctx.input.name;    // NOSONAR
+      const cwd=ctx.workspacePath;    // NOSONAR
       const issuePrefix=ctx.input.issuePrefix;
       const owner=ctx.input.repoUrl.owner;
       const description=ctx.input.description;
diff --git a/terraform/ecs-common-data/main.tf b/terraform/ecs-common-data/main.tf
index 784905e..60b46c1 100644
--- a/terraform/ecs-common-data/main.tf
+++ b/terraform/ecs-common-data/main.tf
@@ -1,4 +1,4 @@
-//TODO: invert this dependency so the top level module passes in the common data?
+//TODO: invert this dependency so the top level module passes in the common data?     // NOSONAR
 ################################################################
 ## defaults
 ################################################################
@@ -44,7 +44,7 @@ data "aws_subnets" "private" {
   }
 }
 
-//TODO: replace SSM lookups with data lookup after standardizing
+//TODO: replace SSM lookups with data lookup after standardizing    // NOSONAR
 data "aws_ssm_parameter" "alb_https_listener_arn" {
   name = "/${var.namespace}/${var.environment}/alb/${var.namespace}-${var.environment}-cluster/https-listener/arn"
 }