diff --git a/application.properties b/application.properties
index dccc6be..9eabdce 100644
--- a/application.properties
+++ b/application.properties
@@ -165,32 +165,33 @@ context.workDirLocation=/work/Tomcat/localhost
 
 ## START OF CSP ENFORCE BLOCK (DO NOT CHANGE THIS TEXT)
 csp.enforce=\
-    default-src 'self' https: ;\
-    connect-src 'self' ${LABKEY.ALLOWED.CONNECTIONS} ;\
-    object-src 'none' ;\
-    style-src 'self' https: 'unsafe-inline' ;\
-    img-src 'self' https: data: ;\
-    font-src 'self' data: ;\
-    script-src 'self' 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ;\
-    base-uri 'self' ;\
+    default-src 'self' https: ; \
+    connect-src 'self' ${CONNECTION.SOURCES} ; \
+    object-src 'none' ; \
+    style-src 'self' https: 'unsafe-inline' ${STYLE.SOURCES} ; \
+    img-src 'self' https: data: ${IMAGE.SOURCES} ; \
+    font-src 'self' data: ${FONT.SOURCES} ; \
+    script-src 'self' 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ; \
+    base-uri 'self' ; \
     upgrade-insecure-requests ;\
-    frame-ancestors 'self' ;\
-    report-uri https://www.labkey.org/admin-contentsecuritypolicyreport.api?${CSP.REPORT.PARAMS} ;
+    frame-ancestors 'self' ; \
+    frame-src 'self' ${FRAME.SOURCES} ; \
+    report-uri https://www.labkey.org/admin-contentSecurityPolicyReport.api?cspVersion=e10&${CSP.REPORT.PARAMS} ;
 ## END OF CSP ENFORCE BLOCK (DO NOT CHANGE THIS TEXT)
 
 ## START OF CSP REPORT BLOCK (DO NOT CHANGE THIS TEXT)
 csp.report=\
-    default-src 'self' ;                                                            /* Limit the default to only the current server */\
-    connect-src 'self' ${CONNECTION.SOURCES} ;                                      /* For security purposes limit allowed connection sources, can be substituted and appended via the LabKey Admin UI */\
-    object-src 'none' ;                                                             /* These tags are not currently used by LKS */\
-    style-src 'self' 'unsafe-inline' ${STYLE.SOURCES} ;                             /* We currently have a few inline <style> tags that we are weeding out */\
-    img-src 'self' data: ;                                                          /* Limit image loading locations */\
-    font-src 'self' data: ${FONT.SOURCES} ;                                         /* Limit font source loading locations */\
-    script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ;     /* Limit scripts that are allowed to those with nonces or transitive scripts */\
-    base-uri 'self' ;                                                               /* Limit the base tags to only source from current server */\
-    frame-ancestors 'self' ;                                                        /* Only allow iframe resources to the current server */\
-    frame-src 'self' ${FRAME.SOURCES} ;                                             /* Only allow iframe resources from the current server plus explicitly declared external sources */\
-    report-uri https://www.labkey.org/admin-contentsecuritypolicyreport.api?${CSP.REPORT.PARAMS} ;        /* Reports any encountered CSP conflicts to the supplied URL */
+    default-src 'self' ;                                                                    /* Limit the default to only the current server */\
+    connect-src 'self' ${CONNECTION.SOURCES} ;                                              /* Limit allowed connection sources */\
+    object-src 'none' ;                                                                     /* These tags are not currently used by LKS */\
+    style-src 'self' 'unsafe-inline' ${STYLE.SOURCES} ;                                     /* We currently have a few inline <style> tags that we are weeding out */\
+    img-src 'self' data: ${IMAGE.SOURCES} ;                                                 /* Limit image loading locations */\
+    font-src 'self' data: ${FONT.SOURCES} ;                                                 /* Limit font source loading locations */\
+    script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ;             /* Limit scripts to those with nonces or transitive scripts */\
+    base-uri 'self' ;                                                                       /* Limit the base tags to only source from current server */\
+    frame-ancestors 'self' ;                                                                /* Limit iframe content destinations (who can load this server's content into an iframe) */\
+    frame-src 'self' ${FRAME.SOURCES} ;                                                     /* Limit iframe content sources (from what servers can this server's iframe content be loaded) */\
+    report-uri https://www.labkey.org/admin-contentSecurityPolicyReport.api?cspVersion=r11&${CSP.REPORT.PARAMS} ; /* Report any encountered CSP violations to the supplied URL */
 ## END OF CSP REPORT BLOCK (DO NOT CHANGE THIS TEXT)
 
 ## Load optional application.properties if file exists - used for one-off labkey cloud use cases etc.