diff --git a/internal/resources/machinelearning/resource_alert.go b/internal/resources/machinelearning/resource_alert.go
index 48a76c613..50574b69c 100644
--- a/internal/resources/machinelearning/resource_alert.go
+++ b/internal/resources/machinelearning/resource_alert.go
@@ -115,6 +115,9 @@ func (r *alertResource) Schema(ctx context.Context, req resource.SchemaRequest,
 			"id": schema.StringAttribute{
 				Description: "The ID of the alert.",
 				Computed:    true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 			"title": schema.StringAttribute{
 				Description: "The title of the alert.",
@@ -341,9 +344,9 @@ func (r *alertResource) read(ctx context.Context, model resourceAlertModel) (*re
 		err   error
 	)
 	if model.JobID.ValueString() != "" {
-		alert, err = r.mlapi.JobAlert(ctx, model.JobID.ValueString(), model.ID.String())
+		alert, err = r.mlapi.JobAlert(ctx, model.JobID.ValueString(), model.ID.ValueString())
 	} else {
-		alert, err = r.mlapi.OutlierAlert(ctx, model.OutlierID.ValueString(), model.ID.String())
+		alert, err = r.mlapi.OutlierAlert(ctx, model.OutlierID.ValueString(), model.ID.ValueString())
 	}
 	if err != nil {
 		return nil, diag.Diagnostics{diag.NewErrorDiagnostic("Unable to read resource", err.Error())}
diff --git a/internal/resources/machinelearning/resource_alert_test.go b/internal/resources/machinelearning/resource_alert_test.go
index 23950251b..66d11fb0d 100644
--- a/internal/resources/machinelearning/resource_alert_test.go
+++ b/internal/resources/machinelearning/resource_alert_test.go
@@ -18,7 +18,7 @@ func TestAccResourceJobAlert(t *testing.T) {
 	testutils.CheckCloudInstanceTestsEnabled(t)
 
 	randomJobName := acctest.RandomWithPrefix("Test Job")
-	randomAlertName := acctest.RandomWithPrefix("Test Job Alert")
+	randomAlertName := acctest.RandomWithPrefix("Test Alert")
 
 	var job mlapi.Job
 	var alert mlapi.Alert
@@ -37,6 +37,28 @@ func TestAccResourceJobAlert(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccMLJobCheckExists("grafana_machine_learning_job.test_alert_job", &job),
 					testAccMLJobAlertCheckExists("grafana_machine_learning_alert.test_job_alert", &job, &alert),
+					resource.TestCheckResourceAttrSet("grafana_machine_learning_alert.test_job_alert", "id"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "title", randomAlertName),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "anomaly_condition", "any"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "threshold", ">0.8"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "window", "15m"),
+				),
+			},
+			// Update the alert with a new anomaly condition.
+			{
+				Config: testutils.TestAccExampleWithReplace(t, "resources/grafana_machine_learning_alert/resource.tf", map[string]string{
+					"Test Job":   randomJobName,
+					"Test Alert": randomAlertName,
+					"\"any\"":    "\"low\"",
+				}),
+				Check: resource.ComposeTestCheckFunc(
+					testAccMLJobCheckExists("grafana_machine_learning_job.test_alert_job", &job),
+					testAccMLJobAlertCheckExists("grafana_machine_learning_alert.test_job_alert", &job, &alert),
+					resource.TestCheckResourceAttrSet("grafana_machine_learning_alert.test_job_alert", "id"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "title", randomAlertName),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "anomaly_condition", "low"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "threshold", ">0.8"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_job_alert", "window", "15m"),
 				),
 			},
 			{
@@ -54,8 +76,8 @@ func TestAccResourceJobAlert(t *testing.T) {
 func TestAccResourceOutlierAlert(t *testing.T) {
 	testutils.CheckCloudInstanceTestsEnabled(t)
 
-	randomOutlierName := acctest.RandomWithPrefix("Test Job")
-	randomAlertName := acctest.RandomWithPrefix("Test Outlier Alert")
+	randomOutlierName := acctest.RandomWithPrefix("Test Outlier")
+	randomAlertName := acctest.RandomWithPrefix("Test Alert")
 
 	var outlier mlapi.OutlierDetector
 	var alert mlapi.Alert
@@ -74,6 +96,22 @@ func TestAccResourceOutlierAlert(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccMLOutlierCheckExists("grafana_machine_learning_outlier_detector.test_alert_outlier_detector", &outlier),
 					testAccMLOutlierAlertCheckExists("grafana_machine_learning_alert.test_outlier_alert", &outlier, &alert),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_outlier_alert", "title", randomAlertName),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_outlier_alert", "window", "1h"),
+				),
+			},
+			// Test updating the window.
+			{
+				Config: testutils.TestAccExampleWithReplace(t, "resources/grafana_machine_learning_alert/outlier_alert.tf", map[string]string{
+					"Test Outlier": randomOutlierName,
+					"Test Alert":   randomAlertName,
+					"\"1h\"":       "\"30m\"",
+				}),
+				Check: resource.ComposeTestCheckFunc(
+					testAccMLOutlierCheckExists("grafana_machine_learning_outlier_detector.test_alert_outlier_detector", &outlier),
+					testAccMLOutlierAlertCheckExists("grafana_machine_learning_alert.test_outlier_alert", &outlier, &alert),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_outlier_alert", "title", randomAlertName),
+					resource.TestCheckResourceAttr("grafana_machine_learning_alert.test_outlier_alert", "window", "30m"),
 				),
 			},
 			{