diff --git a/cfn-templates/cid-plugin.yml b/cfn-templates/cid-plugin.yml
index 6475a366..3cde8b21 100644
--- a/cfn-templates/cid-plugin.yml
+++ b/cfn-templates/cid-plugin.yml
@@ -21,11 +21,17 @@ Parameters:
     Description:  'Is DataCollectionRequired'
     AllowedValues: ["yes", "no"]
     Default: 'no'
+  RequiresAccountMapDatabase:
+    Type: String
+    Description:  'Is AccountMapDatabaseRequired'
+    AllowedValues: ["yes", "no"]
+    Default: 'no'
 
 Conditions:
   ResourcesUrlIsEmpty: !Equals [!Ref ResourcesUrl, '']
   RequiresDataCollection: !Equals [!Ref RequiresDataCollection, 'yes']
   RequiresDataExports: !Equals [!Ref RequiresDataExports, 'yes']
+  RequiresAccountMapDatabase: !Equals [!Ref RequiresAccountMapDatabase, 'yes']
 
 Resources:
   Dashboard:
@@ -36,6 +42,7 @@ Resources:
       Dashboard:
         dashboard-id: !Ref DashboardId
         account-map-source: 'dummy'
+        account-map-database-name: !If [RequiresAccountMapDatabase, {'Fn::ImportValue':  "cid-CidDatabase"}, !Ref 'AWS::NoValue']
         data-collection-database-name: 'optimization_data'
         resources: !If [ResourcesUrlIsEmpty, !Ref 'AWS::NoValue', !Ref ResourcesUrl]
         data_exports_database_name: !If [RequiresDataExports, {'Fn::ImportValue':  "cid-DataExports-Database"}, !Ref 'AWS::NoValue']