diff --git a/src/middleware/content_security_policy_middleware_config.ts b/src/middleware/content_security_policy_middleware_config.ts
index 05a0dd90..5969958b 100644
--- a/src/middleware/content_security_policy_middleware_config.ts
+++ b/src/middleware/content_security_policy_middleware_config.ts
@@ -32,7 +32,6 @@ export const prepareCSPConfig = (nonce: string) : HelmetOptions => {
 
 export const prepareCSPConfigHomePage = (nonce: string) : HelmetOptions => {
     const NONCE = `'nonce-${nonce}'`;
-
     return {
         contentSecurityPolicy: {
             directives: {
@@ -58,8 +57,9 @@ export const prepareCSPConfigHomePage = (nonce: string) : HelmetOptions => {
 };
 
 const formActionDirective = (ishomepage: boolean) => {
+    const ALL_CHS_URLS = "*";
     if (ishomepage) {
-        return ["*aws.chsdev.org"];
+        return [ALL_CHS_URLS];
     } else {
         return [SELF, PIWIK_CHS_DOMAIN, CHS_URL];
     }
diff --git a/src/services/business-address/businessAddressService.ts b/src/services/business-address/businessAddressService.ts
index 9d52d48c..3f5fdfe2 100644
--- a/src/services/business-address/businessAddressService.ts
+++ b/src/services/business-address/businessAddressService.ts
@@ -18,7 +18,7 @@ export class BusinessAddressService {
         acspData.registeredOfficeAddress = businessAddress;
     }
 
-    public getBusinessManualAddress (acspData: AcspData | AcspFullProfile ) {
+    public getBusinessManualAddress (acspData: AcspData | AcspFullProfile) {
         return {
             addressPropertyDetails: acspData?.registeredOfficeAddress?.premises,
             addressLine1: acspData?.registeredOfficeAddress?.addressLine1,