diff --git a/.github/workflows/merge_to_main_staging.yml b/.github/workflows/merge_to_main_staging.yml
index ee2457bc7..aff9cceb2 100644
--- a/.github/workflows/merge_to_main_staging.yml
+++ b/.github/workflows/merge_to_main_staging.yml
@@ -139,10 +139,10 @@ jobs:
           cd env/staging/database-tools
           terragrunt apply --terragrunt-non-interactive -auto-approve
 
-      # - name: Apply aws/quicksight
-      #   run: |
-      #     cd env/staging/quicksight
-      #     terragrunt apply --terragrunt-non-interactive -auto-approve
+      - name: Apply aws/quicksight
+        run: |
+          cd env/staging/quicksight
+          terragrunt apply --terragrunt-non-interactive -auto-approve
 
       - name: Apply aws/lambda-google-cidr
         run: |
diff --git a/.github/workflows/terragrunt_plan_staging.yml b/.github/workflows/terragrunt_plan_staging.yml
index 5eb0a0513..133e6577e 100644
--- a/.github/workflows/terragrunt_plan_staging.yml
+++ b/.github/workflows/terragrunt_plan_staging.yml
@@ -263,15 +263,15 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           terragrunt: "true"
 
-      # - name: Terragrunt plan quicksight
-      #   if: ${{ steps.filter.outputs.quicksight == 'true' || steps.filter.outputs.common == 'true' }}
-      #   uses: cds-snc/terraform-plan@v3
-      #   with:
-      #     directory: "env/staging/quicksight"
-      #     comment-delete: "true"
-      #     comment-title: "Staging: quicksight"
-      #     github-token: "${{ secrets.GITHUB_TOKEN }}"
-      #     terragrunt: "true"
+      - name: Terragrunt plan quicksight
+        if: ${{ steps.filter.outputs.quicksight == 'true' || steps.filter.outputs.common == 'true' }}
+        uses: cds-snc/terraform-plan@v3
+        with:
+          directory: "env/staging/quicksight"
+          comment-delete: "true"
+          comment-title: "Staging: quicksight"
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          terragrunt: "true"
 
       - name: Terragrunt plan lambda-google-cidr
         if: ${{ steps.filter.outputs.lambda-google-cidr == 'true' || steps.filter.outputs.common == 'true' }}
diff --git a/aws/quicksight/dataset_notification_history.tf b/aws/quicksight/dataset_notification_history.tf
index 92e061a5a..e4d9bffb6 100644
--- a/aws/quicksight/dataset_notification_history.tf
+++ b/aws/quicksight/dataset_notification_history.tf
@@ -6,7 +6,7 @@ resource "aws_quicksight_data_set" "notification_history" {
   import_mode = "SPICE"
 
   physical_table_map {
-    physical_table_map_id = "notification_history"
+    physical_table_map_id = "notification-history"
     relational_table {
       data_source_arn = aws_quicksight_data_source.rds.arn
       name            = "notification_history"
diff --git a/aws/quicksight/dataset_services_history.tf b/aws/quicksight/dataset_services_history.tf
index e83eebd09..c1dba663c 100644
--- a/aws/quicksight/dataset_services_history.tf
+++ b/aws/quicksight/dataset_services_history.tf
@@ -6,7 +6,7 @@ resource "aws_quicksight_data_set" "services_history" {
   import_mode = "SPICE"
 
   physical_table_map {
-    physical_table_map_id = "services_history"
+    physical_table_map_id = "services-history"
     relational_table {
       data_source_arn = aws_quicksight_data_source.rds.arn
       name            = "services_history"
diff --git a/aws/quicksight/dataset_templates.tf b/aws/quicksight/dataset_templates.tf
index d01845d88..3d67e219d 100644
--- a/aws/quicksight/dataset_templates.tf
+++ b/aws/quicksight/dataset_templates.tf
@@ -1,12 +1,12 @@
 # valid column types are [STRING INTEGER DECIMAL DATETIME BIT BOOLEAN JSON]
 
 resource "aws_quicksight_data_set" "templates" {
-  data_set_id = "templates"
-  name        = "Templates"
+  data_set_id = "templatesv2"
+  name        = "TemplatesV2"
   import_mode = "SPICE"
 
   physical_table_map {
-    physical_table_map_id = "templates"
+    physical_table_map_id = "templatesv2"
     relational_table {
       data_source_arn = aws_quicksight_data_source.rds.arn
       name            = "templates"
diff --git a/aws/quicksight/dataset_templates_history.tf b/aws/quicksight/dataset_templates_history.tf
index aa9a9a50f..493536c17 100644
--- a/aws/quicksight/dataset_templates_history.tf
+++ b/aws/quicksight/dataset_templates_history.tf
@@ -6,7 +6,7 @@ resource "aws_quicksight_data_set" "templates_history" {
   import_mode = "SPICE"
 
   physical_table_map {
-    physical_table_map_id = "templates_history"
+    physical_table_map_id = "templates-history"
     relational_table {
       data_source_arn = aws_quicksight_data_source.rds.arn
       name            = "templates_history"