diff --git a/internal/services/jobs/jobs.go b/internal/services/jobs/jobs.go
index 1c77554770..8c52d8bd49 100644
--- a/internal/services/jobs/jobs.go
+++ b/internal/services/jobs/jobs.go
@@ -126,6 +126,7 @@ func ResourceDefinition() *schema.Resource {
 						"secret_reference_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
+							Optional:    true,
 							Description: "The secret reference UUID",
 						},
 						"secret_version": {
@@ -150,6 +151,8 @@ func ResourceDefinition() *schema.Resource {
 				},
 			},
 		},
+		EnableLegacyTypeSystemPlanErrors:  true,
+		EnableLegacyTypeSystemApplyErrors: true,
 	}
 }
 
@@ -234,14 +237,22 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m an
 	_ = d.Set("cpu_limit", int(definition.CPULimit))
 	_ = d.Set("memory_limit", int(definition.MemoryLimit))
 	_ = d.Set("image_uri", definition.ImageURI)
-	_ = d.Set("command", definition.Command)
-	_ = d.Set("env", types.FlattenMap(definition.EnvironmentVariables))
-	_ = d.Set("description", definition.Description)
+	if _, ok := d.GetOk("command"); ok {
+		d.Set("command", definition.Command)
+	}
+	if _, ok := d.GetOk("env"); ok {
+		_ = d.Set("env", types.FlattenMap(definition.EnvironmentVariables))
+	}
+	if _, ok := d.GetOk("description"); ok {
+		_ = d.Set("description", definition.Description)
+	}
 	_ = d.Set("timeout", definition.JobTimeout.ToTimeDuration().String())
 	_ = d.Set("cron", flattenJobDefinitionCron(definition.CronSchedule))
 	_ = d.Set("region", definition.Region)
 	_ = d.Set("project_id", definition.ProjectID)
-	_ = d.Set("secret_reference", flattenJobDefinitionSecret(rawSecretRefs.Secrets))
+	if _, ok := d.GetOk("secret_reference"); ok {
+		_ = d.Set("secret_reference", flattenJobDefinitionSecret(rawSecretRefs.Secrets))
+	}
 
 	return nil
 }
diff --git a/internal/services/jobs/jobs_test.go b/internal/services/jobs/jobs_test.go
index 50b9182efc..9bb5281392 100644
--- a/internal/services/jobs/jobs_test.go
+++ b/internal/services/jobs/jobs_test.go
@@ -61,7 +61,7 @@ func TestAccJobDefinition_Timeout(t *testing.T) {
 						cpu_limit = 120
 						memory_limit = 256
 						image_uri = "docker.io/alpine:latest"
-						timeout = "20m"
+						timeout = "20m0s"
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
@@ -78,7 +78,7 @@ func TestAccJobDefinition_Timeout(t *testing.T) {
 						cpu_limit = 120
 						memory_limit = 256
 						image_uri = "docker.io/alpine:latest"
-						timeout = "1h30m"
+						timeout = "1h30m0s"
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(