coder
diff --git a/‎coderd/schedule/cron/schedule_validation.go
Lines changed: 14 additions & 2 deletions b/‎coderd/schedule/cron/schedule_validation.go
Lines changed: 14 additions & 2 deletions
diff --git a/‎coderd/schedule/cron/schedule_validation_test.go
Lines changed: 16 additions & 6 deletions b/‎coderd/schedule/cron/schedule_validation_test.go
Lines changed: 16 additions & 6 deletions
@@ -86,9 +86,20 @@ func DowOverlap(dow1, dow2 string) (bool, error) {
 }
 
 // DaysOverlap checks if two day ranges overlap, considering both DOM and DOW.
-// Returns true if either DOM ranges overlap OR DOW ranges overlap.
+// Returns true if both DOM and DOW overlap, or if one is * and the other overlaps.
 func DaysOverlap(dom1, dow1, dom2, dow2 string) (bool, error) {
-	// Check if either DOM or DOW overlaps
+	// If either DOM is *, we only need to check DOW overlap
+	if dom1 == "*" || dom2 == "*" {
+		return DowOverlap(dow1, dow2)
+	}
+
+	// If either DOW is *, we only need to check DOM overlap
+	if dow1 == "*" || dow2 == "*" {
+		return DomOverlap(dom1, dom2)
+	}
+
+	// If both DOM and DOW are specified, we need to check both
+	// because the schedule runs when either matches
 	domOverlap, err := DomOverlap(dom1, dom2)
 	if err != nil {
 		return false, err
@@ -98,6 +109,7 @@ func DaysOverlap(dom1, dow1, dom2, dow2 string) (bool, error) {
 		return false, err
 	}
 
+	// If either DOM or DOW overlaps, the schedules overlap
 	return domOverlap || dowOverlap, nil
 }
 
 
@@ -377,15 +377,15 @@ func TestSchedulesOverlap(t *testing.T) {
 		// Day of week overlap cases (with wildcard DOM)
 		{
 			name:    "Different DOW with wildcard DOM",
-			s1:      "* 9-18 * * 1,3,5",
-			s2:      "* 9-18 * * 2,4,6",
-			overlap: true, // Overlaps because of wildcard DOM
+			s1:      "* 9-18 * * 1,3,5", // Mon,Wed,Fri
+			s2:      "* 9-18 * * 2,4,6", // Tue,Thu,Sat
+			overlap: false,              // No overlap because DOW ranges don't overlap
 		},
 		{
 			name:    "Different DOW with wildcard DOM - complex ranges",
-			s1:      "* 9-18 * * 1-3",
-			s2:      "* 9-18 * * 4-5",
-			overlap: true, // Overlaps because of wildcard DOM
+			s1:      "* 9-18 * * 1-3", // Mon-Wed
+			s2:      "* 9-18 * * 4-5", // Thu-Fri
+			overlap: false,            // No overlap because DOW ranges don't overlap
 		},
 
 		// Day of week overlap cases (with specific DOM)
@@ -499,6 +499,8 @@ func TestValidateSchedules(t *testing.T) {
 			},
 			expectErr: false,
 		},
+
+		// Non-overlapping schedules
 		{
 			name: "Multiple valid non-overlapping schedules",
 			schedules: []string{
@@ -507,6 +509,14 @@ func TestValidateSchedules(t *testing.T) {
 			},
 			expectErr: false,
 		},
+		{
+			name: "Multiple valid non-overlapping schedules",
+			schedules: []string{
+				"* 9-18 * * 1-5",
+				"* 9-13 * * 6,0",
+			},
+			expectErr: false,
+		},
 
 		// Overlapping schedules
 		{