diff --git a/cfn-parameters.json b/cfn-parameters.json
index a9e1b0e..39900ff 100644
--- a/cfn-parameters.json
+++ b/cfn-parameters.json
@@ -5,5 +5,6 @@
     "CodeBranch": $env.GITHUB_REF_SLUG_CS,
 	"Hostname": "api.catalog.platform.serverlessops.io",
 	"DnsZoneId": $secrets.ROUTE53_ZONE_ID,
-    "CognitoUserPoolArn": $secrets.COGNITO_USER_POOL_ARN
+    "CognitoUserPoolArn": $secrets.COGNITO_USER_POOL_ARN,
+    "EnableSourceMaps": true
 }
\ No newline at end of file
diff --git a/template.yaml b/template.yaml
index 919262f..45f282e 100644
--- a/template.yaml
+++ b/template.yaml
@@ -77,9 +77,10 @@ Resources:
     Metadata:
       BuildMethod: esbuild
       BuildProperties:
-        Minify: true
+        Minify: false
         Target: "es2024"
         Format: "esm"
+        MainFields: module,main # This is to help with ESM modules
         Sourcemap: !Ref EnableSourceMaps
         OutExtension:
           - .js=.mjs
@@ -108,6 +109,7 @@ Resources:
         Minify: true
         Target: "es2024"
         Format: "esm"
+        MainFields: module,main # This is to help with ESM modules
         Sourcemap: !Ref EnableSourceMaps
         OutExtension:
           - .js=.mjs
@@ -136,6 +138,7 @@ Resources:
         Minify: true
         Target: "es2024"
         Format: "esm"
+        MainFields: module,main # This is to help with ESM modules
         Sourcemap: !Ref EnableSourceMaps
         OutExtension:
           - .js=.mjs
@@ -164,6 +167,7 @@ Resources:
         Minify: true
         Target: "es2024"
         Format: "esm"
+        MainFields: module,main # This is to help with ESM modules
         Sourcemap: !Ref EnableSourceMaps
         OutExtension:
           - .js=.mjs