diff --git a/backendAWS/bin/backend_aws.ts b/backendAWS/bin/backend_aws.ts
index be02dd4ba15941d2219f7ffd6d534fdd236e079c..af545c1823b4ff91186cbe5510851440406155dc 100644
--- a/backendAWS/bin/backend_aws.ts
+++ b/backendAWS/bin/backend_aws.ts
@@ -7,6 +7,12 @@ import { FrontendStack } from '../lib/frontend_stack';
 
 const app = new cdk.App();
 
+// Common environment configuration
+const env = {
+  account: process.env.CDK_DEFAULT_ACCOUNT,
+  region: process.env.CDK_DEFAULT_REGION,
+};
+
 //Adding Tags for better overview of costs
 cdk.Tags.of(app).add('Environment', 'Production');
 cdk.Tags.of(app).add('Project', 'ContactsApp');
@@ -14,28 +20,17 @@ cdk.Tags.of(app).add('Project', 'ContactsApp');
 const authStack = new AuthenticationStack(
   app,
   'ContactApp-AuthenticationStack',
-  {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  }
+  { env }
 );
 const storageStack = new StorageStack(app, 'ContactApp-StorageStack', {
-  env: {
-    account: process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_DEFAULT_REGION,
-  },
+  env,
 });
 
 const lambdaStack = new LambdaStack(app, 'ContactApp-LambdaStack', {
   contactsTable: storageStack.contactsTable,
   contactsBucket: storageStack.contactsBucket,
   cloudfrontImagesDistribution: storageStack.cloudfrontImagesDistribution,
-  env: {
-    account: process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_DEFAULT_REGION,
-  },
+  env,
 });
 
 new ApiGatewayStack(app, 'ContactApp-ApiGatewayStack', {
@@ -44,16 +39,10 @@ new ApiGatewayStack(app, 'ContactApp-ApiGatewayStack', {
   updateContactFunction: lambdaStack.updateContactFunction,
   deleteContactFunction: lambdaStack.deleteContactFunction,
   getContactFunction: lambdaStack.getContactFunction,
-  env: {
-    account: process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_DEFAULT_REGION,
-  },
+  env,
 });
 
 new FrontendStack(app, 'ContactApp-FrontendStack', {
   contactsBucket: storageStack.contactsBucket,
-  env: {
-    account: process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_DEFAULT_REGION,
-  },
+  env,
 });
diff --git a/backendAWS/lib/frontend_stack.ts b/backendAWS/lib/frontend_stack.ts
index e05fcc0ec060fa6839e22d4b1eccd62c91be7cea..6a336d5c641736ef716e493a382dea9bb04007cb 100644
--- a/backendAWS/lib/frontend_stack.ts
+++ b/backendAWS/lib/frontend_stack.ts
@@ -19,7 +19,7 @@ export class FrontendStack extends cdk.Stack {
     const frontendBucket = new s3.Bucket(this, 'ContactsAppFrontendBucket', {
       bucketName: 'contacts-app-frontend-bucket',
       websiteIndexDocument: 'index.html',
-      /*       websiteErrorDocument: 'error.html', */
+      websiteErrorDocument: 'index.html',
       removalPolicy: cdk.RemovalPolicy.DESTROY, // Only for dev environments
       publicReadAccess: false,
       blockPublicAccess: s3.BlockPublicAccess.BLOCK_ACLS,