diff --git a/common/changes/subapp-server/csp-directive_2024-03-01-04-51.json b/common/changes/subapp-server/csp-directive_2024-03-01-04-51.json
deleted file mode 100644
index c12d36241..000000000
--- a/common/changes/subapp-server/csp-directive_2024-03-01-04-51.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "subapp-server",
-      "comment": "Ablity to add CSP directives by application.",
-      "type": "minor"
-    }
-  ],
-  "packageName": "subapp-server"
-}
\ No newline at end of file
diff --git a/packages/subapp-server/CHANGELOG.json b/packages/subapp-server/CHANGELOG.json
index fbc245d2f..f4818b7a6 100644
--- a/packages/subapp-server/CHANGELOG.json
+++ b/packages/subapp-server/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "subapp-server",
   "entries": [
+    {
+      "version": "2.4.0",
+      "tag": "subapp-server_v2.4.0",
+      "date": "Thu, 07 Mar 2024 02:33:25 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Ablity to add CSP directives by application."
+          }
+        ]
+      }
+    },
     {
       "version": "2.3.0",
       "tag": "subapp-server_v2.3.0",
diff --git a/packages/subapp-server/CHANGELOG.md b/packages/subapp-server/CHANGELOG.md
index 30ee6947b..7fcc02167 100644
--- a/packages/subapp-server/CHANGELOG.md
+++ b/packages/subapp-server/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - subapp-server
 
-This log was last generated on Wed, 03 Jan 2024 23:41:10 GMT and should not be manually modified.
+This log was last generated on Thu, 07 Mar 2024 02:33:25 GMT and should not be manually modified.
+
+## 2.4.0
+Thu, 07 Mar 2024 02:33:25 GMT
+
+### Minor changes
+
+- Ablity to add CSP directives by application.
 
 ## 2.3.0
 Wed, 03 Jan 2024 23:41:10 GMT
diff --git a/packages/subapp-server/package.json b/packages/subapp-server/package.json
index bfc590aed..a95ea4a29 100644
--- a/packages/subapp-server/package.json
+++ b/packages/subapp-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-server",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Electrode SubApp app server support",
   "main": "lib/index.js",
   "scripts": {
diff --git a/samples/poc-subapp-redux/package.json b/samples/poc-subapp-redux/package.json
index a67c171e9..240eacd4f 100644
--- a/samples/poc-subapp-redux/package.json
+++ b/samples/poc-subapp-redux/package.json
@@ -52,7 +52,7 @@
     "redux-logger": "^3.0.6",
     "subapp-react": "^1.2.0",
     "subapp-redux": "^2.2.1",
-    "subapp-server": "^2.3.0",
+    "subapp-server": "^2.4.0",
     "subapp-web": "^2.1.4"
   },
   "devDependencies": {
diff --git a/samples/poc-subapp/package.json b/samples/poc-subapp/package.json
index 8462f794b..b208f817c 100644
--- a/samples/poc-subapp/package.json
+++ b/samples/poc-subapp/package.json
@@ -52,7 +52,7 @@
     "redux": "^4.2.1",
     "subapp-react": "^1.2.0",
     "subapp-redux": "^2.2.1",
-    "subapp-server": "^2.3.0",
+    "subapp-server": "^2.4.0",
     "subapp-web": "^2.1.4"
   },
   "devDependencies": {
diff --git a/samples/poc-subappv1-csp/package.json b/samples/poc-subappv1-csp/package.json
index 71b9ce516..72b4ce8f2 100644
--- a/samples/poc-subappv1-csp/package.json
+++ b/samples/poc-subappv1-csp/package.json
@@ -50,7 +50,7 @@
     "redux": "^4.2.1",
     "subapp-react": "^1.2.0",
     "subapp-redux": "^2.2.1",
-    "subapp-server": "^2.3.0",
+    "subapp-server": "^2.4.0",
     "subapp-web": "^2.1.4",
     "crypto": "^1.0.1"
   },
diff --git a/samples/poc-subappv1-csp/src/routes.js b/samples/poc-subappv1-csp/src/routes.js
index 17b1cf2cd..bffc55efb 100644
--- a/samples/poc-subappv1-csp/src/routes.js
+++ b/samples/poc-subappv1-csp/src/routes.js
@@ -36,6 +36,7 @@ const setCSPHeaderValues = ({styleNonce, scriptNonce}) => {
  * Option 3 - Selectively set boolean flag for `cspNonce`. { style: true } will add nonce only 
  * for styles
  * 
+ * cspHeaderValues - A function whose return value is list of CPS headers. If provided, this function will be used to configure headers specified by the application. In the absense of this function, Electrode will configure `script-src` and `style-src` directives based on settings determined by `cspNonce` value
  */
 
 export default {