diff --git a/examples/resources/biganimal_analytics_cluster/aws/resource.tf b/examples/resources/biganimal_analytics_cluster/aws/resource.tf
index f8b5e123..64c8b463 100644
--- a/examples/resources/biganimal_analytics_cluster/aws/resource.tf
+++ b/examples/resources/biganimal_analytics_cluster/aws/resource.tf
@@ -32,6 +32,16 @@ resource "biganimal_analytics_cluster" "analytics_cluster" {
   project_id   = var.project_id
   pause        = false
 
+  #tags = [
+  #  {
+  #     tag_name  = "wai-tag-3"
+  #     color = "blue"
+  #  },
+  #  {
+  #     tag_name  = "wai-tag-4"
+  #  },
+  #]
+
   allowed_ip_ranges = [
     {
       cidr_block  = "127.0.0.1/32"
diff --git a/pkg/provider/data_source_analytics_cluster.go b/pkg/provider/data_source_analytics_cluster.go
index 046c6ac7..f54b1c88 100644
--- a/pkg/provider/data_source_analytics_cluster.go
+++ b/pkg/provider/data_source_analytics_cluster.go
@@ -193,6 +193,23 @@ func (r *analyticsClusterDataSource) Schema(ctx context.Context, req datasource.
 					"Pausing a high availability cluster shuts down all cluster nodes",
 				Optional: true,
 			},
+			"tags": schema.SetNestedAttribute{
+				Description: "Assign existing tags or create tags to assign to this resource",
+				Computed:    true,
+				NestedObject: schema.NestedAttributeObject{
+					Attributes: map[string]schema.Attribute{
+						"tag_id": schema.StringAttribute{
+							Computed: true,
+						},
+						"tag_name": schema.StringAttribute{
+							Computed: true,
+						},
+						"color": schema.StringAttribute{
+							Computed: true,
+						},
+					},
+				},
+			},
 		},
 	}
 }