diff --git a/ChangeLog.md b/ChangeLog.md
index 2009b075..18f42eb3 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,6 +6,7 @@ Starting with v1.31.6, this file will contain a record of major features and upd
 
 - New notebooks showing Telco examples leveraging GNN and LLM ([Link to PR](https://github.com/aws/graph-notebook/pull/587))
   - Path: 02-Neptune-ML > 03-Sample-Applications > 04-Telco-Networks
+- Added KMS encryption support to NeptuneDB Notebook CloudFormation template (https://github.com/aws/graph-notebook/pull/590)
 
 ## Release 4.2.0 (April 4, 2024)
 
diff --git a/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml b/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
index 036866f8..fd0ca3fb 100644
--- a/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
+++ b/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
@@ -79,7 +79,7 @@ Parameters:
     Type: List<AWS::EC2::SecurityGroup::Id>
 
   NeptuneClusterSubnetId:
-    Description: The ID of the subnet in a VPC to which you would like to have a connectivity from your ML compute instance.
+    Description: The ID of the subnet in a VPC to which you would like to have connectivity from your ML compute instance.
     Type: AWS::EC2::Subnet::Id
 
   SageMakerNotebookRoleArn:
@@ -91,6 +91,11 @@ Parameters:
     Description: The name of the Neptune notebook.
     Type: String
 
+  EncryptionKey:
+    Description: 'OPTIONAL: The ARN of a KMS key to encrypt your notebook data with.'
+    Type: String
+    Default: ''
+
 Conditions:
   UseSageMakerNotebookAutoRole:
     Fn::Equals:
@@ -127,6 +132,8 @@ Resources:
           Value: !Select [ 0, !Split [ ".", !Ref NeptuneClusterEndpoint ] ]
         - Key: aws-neptune-resource-id
           Value: !Ref NeptuneClusterResourceId
+      KmsKeyId:
+        Ref: EncryptionKey
 
   NeptuneNotebookInstanceLifecycleConfig:
     Type: AWS::SageMaker::NotebookInstanceLifecycleConfig