diff --git a/Milamation/ValidationRules/NeedPBIRule.cs b/Milamation/ValidationRules/NeedPBIRule.cs
index 3bbe68e..a7cce26 100644
--- a/Milamation/ValidationRules/NeedPBIRule.cs
+++ b/Milamation/ValidationRules/NeedPBIRule.cs
@@ -1,4 +1,5 @@
 using HarvestClient.Model;
+using System.Linq;
 
 namespace Milamation.ValidationRules
 {
@@ -12,7 +13,7 @@ public override string Validate(TimesheetEntry timesheetEntry)
                 && !timesheetEntry.HasPBI
                 && (
                      TasksRequiringPBI.Contains(timesheetEntry.Task?.Name)
-                     && ProjectsRequiringPBI.Contains(timesheetEntry.Project?.Name)
+                     && ProjectsRequiringPBI.Any(p => timesheetEntry.Project?.Name.StartsWith(p) == true)
                   )
                 )
             {
diff --git a/Milamation/ValidationRules/Rule.cs b/Milamation/ValidationRules/Rule.cs
index 5bf2592..d453119 100644
--- a/Milamation/ValidationRules/Rule.cs
+++ b/Milamation/ValidationRules/Rule.cs
@@ -24,6 +24,7 @@ public abstract class Rule
 
         public virtual List<string> TasksRequiringPBI => new List<string>()
         {
+            { "Infrastructure" },
             { "Software Development" },
             { "QA" },
             { "UX Design" },