diff --git a/cfn-templates/tao.cfn.yml b/cfn-templates/tao.cfn.yml
index 5e424cf93..532da7495 100644
--- a/cfn-templates/tao.cfn.yml
+++ b/cfn-templates/tao.cfn.yml
@@ -601,11 +601,11 @@ Resources:
             DataSourceArn: !GetAtt taoQuickSightDataSource.Arn
             Catalog: AwsDataCatalog
             Schema: !Ref DatabaseName
-            Name: ta_organizational_view_reports
+            Name: !Join [ '' , [ !FindInMap [ "Definitions", "taoAthenaTable", "Value" ] ,  !Ref taoSuffix ] ]
             InputColumns: !FindInMap [ "References", "taoDataSetInputColumns", "Value" ]  
       LogicalTableMap:
         b5de237f-b599-407f-87ec-32024624ba65:
-          Alias: ta_organizational_view_reports
+          Alias: !Join [ '' , [ !FindInMap [ "Definitions", "taoAthenaTable", "Value" ] ,  !Ref taoSuffix ] ] 
           DataTransforms:
           - TagColumnOperation:
               ColumnName: region
@@ -1068,4 +1068,4 @@ Resources:
       Region: !Ref "AWS::Region"
       Name: !Join ['', ["taoLoggerLambdaExecutor", !Ref taoSuffix] ]
       dashboards:
-        - tao
\ No newline at end of file
+        - tao