diff --git a/copilot/copilot.appName.env.template b/copilot/copilot.appName.env.template
index 148be0983bc..155171f81d1 100644
--- a/copilot/copilot.appName.env.template
+++ b/copilot/copilot.appName.env.template
@@ -3,7 +3,6 @@
 # ==================================================
 # These are Flowise-specific settings not handled by manifest
 APIKEY_PATH=/var/efs/
-SECRETKEY_PATH=/var/efs/
 LOG_PATH=/var/efs/logs
 DISABLE_FLOWISE_TELEMETRY=true
 IFRAME_ORIGINS=*
@@ -15,8 +14,13 @@ APIKEY_STORAGE_TYPE=db
 # Enable Flagsmith 
 FLAGSMITH_ENVIRONMENT_ID=
 
-# Encryption Key Override: Overrides the encryption key from SECRETKEY_PATH
-# WARNING: Changing this invalidates all existing encrypted credentials
+# Encryption Key Configuration (Auto-configured via CloudFormation):
+# - SECRETKEY_STORAGE_TYPE=aws (automatically set to use AWS Secrets Manager)  
+# - SECRETKEY_AWS_REGION (automatically set to deployment region)
+# - SECRETKEY_AWS_NAME (automatically set to ${App}-${Env}-FlowiseEncryptionKey)
+# - Each app/environment gets its own unique encryption key for security isolation
+# - FLOWISE_SECRETKEY_OVERWRITE can still be used to override if needed (advanced use cases only)
+# WARNING: Changing encryption keys invalidates all existing encrypted credentials
 # FLOWISE_SECRETKEY_OVERWRITE=
 
 # Session Secret: Cryptographically secure secret for Express session cookies
diff --git a/copilot/environments/addons/flowise-encryption-key.yml b/copilot/environments/addons/flowise-encryption-key.yml
new file mode 100644
index 00000000000..3098a26d5a6
--- /dev/null
+++ b/copilot/environments/addons/flowise-encryption-key.yml
@@ -0,0 +1,38 @@
+Parameters:
+    App:
+        Type: String
+        Description: Your application's name.
+    Env:
+        Type: String
+        Description: The name of the environment being deployed.
+
+Resources:
+    # Create the Flowise encryption key secret
+    FlowiseEncryptionKey:
+        Type: AWS::SecretsManager::Secret
+        Metadata:
+            'aws:copilot:description': 'Flowise encryption key for credential storage'
+        Properties:
+            Name: !Sub '${App}-${Env}-FlowiseEncryptionKey'
+            Description: !Sub 'Flowise encryption key for ${App}-${Env}'
+            GenerateSecretString:
+                PasswordLength: 32
+                IncludeSpace: false
+                # Generate plain string value (not JSON) that Flowise expects
+
+Outputs:
+    FlowiseEncryptionKeyName:
+        Description: 'The name of the Flowise encryption key secret'
+        Value: !Ref FlowiseEncryptionKey
+        Export:
+            Name: !Sub ${App}-${Env}-FlowiseEncryptionKeyName
+    FlowiseEncryptionKeyArn:
+        Description: 'The ARN of the Flowise encryption key secret'
+        Value: !Ref FlowiseEncryptionKey
+        Export:
+            Name: !Sub ${App}-${Env}-FlowiseEncryptionKeyArn
+    FlowiseEncryptionKeyRegion:
+        Description: 'The AWS region where the Flowise encryption key secret is deployed'
+        Value: !Ref AWS::Region
+        Export:
+            Name: !Sub ${App}-${Env}-FlowiseEncryptionKeyRegion
diff --git a/copilot/flowise/addons/flowise-secrets-manager-access-policy.yml b/copilot/flowise/addons/flowise-secrets-manager-access-policy.yml
index 5360e5bc420..9385098ea36 100644
--- a/copilot/flowise/addons/flowise-secrets-manager-access-policy.yml
+++ b/copilot/flowise/addons/flowise-secrets-manager-access-policy.yml
@@ -10,23 +10,24 @@ Parameters:
         Description: Your workload's name.
 
 Resources:
+    # IAM policy to access the environment-level encryption key
     FlowiseSecretsManagerAccessPolicy:
         Type: AWS::IAM::ManagedPolicy
         Metadata:
-            'aws:copilot:description': 'Allow Flowise task role to read FlowiseEncryptionKey from Secrets Manager'
+            'aws:copilot:description': 'Allow Flowise task role to access FlowiseEncryptionKey from Secrets Manager'
         Properties:
-            Description: 'Read-only access for Flowise to retrieve the FlowiseEncryptionKey secret'
+            Description: 'Access for Flowise to retrieve and manage the FlowiseEncryptionKey secret'
             PolicyDocument:
                 Version: '2012-10-17'
                 Statement:
-                    - Sid: ReadFlowiseEncryptionKey
+                    - Sid: AccessFlowiseEncryptionKey
                       Effect: Allow
                       Action:
                           - secretsmanager:GetSecretValue
                           - secretsmanager:CreateSecret
                           - secretsmanager:DescribeSecret
                       Resource:
-                          - !Sub 'arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:FlowiseEncryptionKey-*'
+                          - !Sub 'arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:${App}-${Env}-FlowiseEncryptionKey-*'
                     # If you use a customer-managed KMS key for the secret, also allow kms:Decrypt:
                     # - Sid: DecryptWithCMK
                     #   Effect: Allow
diff --git a/copilot/flowise/manifest.yml b/copilot/flowise/manifest.yml
index 373d8ca8de6..b5673d347e3 100644
--- a/copilot/flowise/manifest.yml
+++ b/copilot/flowise/manifest.yml
@@ -81,6 +81,12 @@ variables: # Pass environment variables as key value pairs.
         from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-theansweraiserverstorageBucketRegion
     # Lacework configuration variables - will be loaded from env file (COMMENTED OUT FOR NOW)
     LaceworkVerbose: 'true'
+    # Flowise encryption key from CloudFormation-managed secret
+    SECRETKEY_STORAGE_TYPE: 'aws'
+    SECRETKEY_AWS_REGION:
+        from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-FlowiseEncryptionKeyRegion
+    SECRETKEY_AWS_NAME:
+        from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-FlowiseEncryptionKeyName
 
 env_file: copilot.${COPILOT_APPLICATION_NAME}.env
 
@@ -111,7 +117,7 @@ environments:
         # Upgrade path: 4096 → 8192 → 16384
         memory: 4096
         # Upgrade path: 8192 → 16384 → 32768
-        # count:
+        count: 2
         #     range: 1-12
         #     # Can handle significant load automatically
         #     cpu_percentage: 85