diff --git a/.github/workflows/Cleanup Caches by a branch.yml b/.github/workflows/Cleanup Caches by a branch.yml
index cf615b84d8..acfb456d64 100644
--- a/.github/workflows/Cleanup Caches by a branch.yml	
+++ b/.github/workflows/Cleanup Caches by a branch.yml	
@@ -6,7 +6,7 @@
 name: Cleanup Caches by a branch
 on:
   pull_request:
-    branches: [main, 'ODS-*']
+    branches: [main, 'b-v*-patch*','feature-*']
     types: [ closed ]
   
 env:
diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml
index ee3c35bac6..c607675ae6 100644
--- a/.github/workflows/Dependencies Security Scan.yml	
+++ b/.github/workflows/Dependencies Security Scan.yml	
@@ -7,7 +7,7 @@ name: Dependency Review Pull request
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, 'b-v*-patch*','feature-*']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -31,9 +31,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
       - name: Checkout code
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
diff --git a/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml b/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml
deleted file mode 100644
index ffb27a9959..0000000000
--- a/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Lib EdFi.Admin.DataAccess Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "1"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages   
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln"
-      shell: pwsh
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.admin.dataaccess manual.yml b/.github/workflows/Lib edFi.admin.dataaccess.yml
similarity index 91%
rename from .github/workflows/Lib edFi.admin.dataaccess manual.yml
rename to .github/workflows/Lib edFi.admin.dataaccess.yml
index 6ac098e963..5e73d4fc15 100644
--- a/.github/workflows/Lib edFi.admin.dataaccess manual.yml	
+++ b/.github/workflows/Lib edFi.admin.dataaccess.yml	
@@ -3,10 +3,15 @@
    # 2.If any new public method get added/modified in Repository class of Ed-Fi-ODS\Application\EdFi.Admin.DataAccess project which interacts with EdFi_Admin Database.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS\Application\EdFi.Admin.DataAccess project
 
-name: Lib EdFi.Admin.DataAccess Manually triggered build
+name: Lib EdFi.Admin.DataAccess
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
@@ -70,12 +75,13 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj" -PackageName  "EdFi.Suite3.Admin.DataAccess"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
+      
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh 
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj" -PackageName  "EdFi.Suite3.Admin.DataAccess"
       shell: pwsh      
diff --git a/.github/workflows/Lib edFi.common pullrequest.yml b/.github/workflows/Lib edFi.common pullrequest.yml
deleted file mode 100644
index c772b62e93..0000000000
--- a/.github/workflows/Lib edFi.common pullrequest.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Lib EdFi.Common Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Application/EdFi.Common/EdFi.Common.sln"
-      shell: pwsh
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.common manual.yml b/.github/workflows/Lib edFi.common.yml
similarity index 91%
rename from .github/workflows/Lib edFi.common manual.yml
rename to .github/workflows/Lib edFi.common.yml
index 6d6fd096ff..7773a16f7c 100644
--- a/.github/workflows/Lib edFi.common manual.yml	
+++ b/.github/workflows/Lib edFi.common.yml	
@@ -3,10 +3,15 @@
    # 2.If any new code changes in Ed-Fi-ODS\Application\EdFi.Common project which interacts with ODS/API solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS\Application\EdFi.Common project
 
-name: Lib EdFi.Common Manually triggered build
+name: Lib EdFi.Common
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj" -PackageName  "EdFi.Suite3.Common"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj" -PackageName  "EdFi.Suite3.Common"
       shell: pwsh      
diff --git a/.github/workflows/Lib edFi.loadtools pullrequest.yml b/.github/workflows/Lib edFi.loadtools pullrequest.yml
deleted file mode 100644
index ab10a31e96..0000000000
--- a/.github/workflows/Lib edFi.loadtools pullrequest.yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Lib EdFi.LoadTools Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "1"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Utilities/DataLoading/LoadTools.sln"
-      shell: pwsh
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Utilities/DataLoading/LoadTools.sln"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Utilities/DataLoading/LoadTools.sln" -TestFilter "RunManually"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.loadtools manual.yml b/.github/workflows/Lib edFi.loadtools.yml
similarity index 92%
rename from .github/workflows/Lib edFi.loadtools manual.yml
rename to .github/workflows/Lib edFi.loadtools.yml
index 076ef5b623..7fb25c5f3e 100644
--- a/.github/workflows/Lib edFi.loadtools manual.yml	
+++ b/.github/workflows/Lib edFi.loadtools.yml	
@@ -3,14 +3,19 @@
    # 2.If any new code changes in Utilities/DataLoading/ folder which interacts with BulkLoadClient /SmokeTest.Console tools for testing the ODS/API solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Utilities/DataLoading/LoadTools.sln solution
 
-name: Lib EdFi.LoadTools Manually triggered build
+name: Lib EdFi.LoadTools
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-22"
+  BUILD_INCREMENTER: "4"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -78,25 +83,17 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj" -PackageName "EdFi.Suite3.SmokeTest.Console"
       shell: pwsh          
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
-    - name: publish load tools
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+    - name: publish load tools,bulk load client & smoke test console
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj"  -PackageName "EdFi.Suite3.LoadTools"
-      shell: pwsh      
-    - name: publish bulk load client
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
-      run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj" -PackageName "EdFi.Suite3.BulkLoadClient.Console"
-      shell: pwsh
-    - name: publish smoke test console
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
-      run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj" -PackageName "EdFi.Suite3.SmokeTest.Console"
-      shell: pwsh
+      shell: pwsh      
     - name: Upload EdFi.LoadTools Artifacts
       if: success()
       uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
diff --git a/.github/workflows/Lib edFi.ods.api pullrequest .yml b/.github/workflows/Lib edFi.ods.api pullrequest .yml
deleted file mode 100644
index 70b2a7cee4..0000000000
--- a/.github/workflows/Lib edFi.ods.api pullrequest .yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Lib EdFi.Ods.Api Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln"
-      shell: pwsh        
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.ods.api manual.yml b/.github/workflows/Lib edFi.ods.api.yml
similarity index 91%
rename from .github/workflows/Lib edFi.ods.api manual.yml
rename to .github/workflows/Lib edFi.ods.api.yml
index 7b71cc97fc..03324cde1c 100644
--- a/.github/workflows/Lib edFi.ods.api manual.yml	
+++ b/.github/workflows/Lib edFi.ods.api.yml	
@@ -3,14 +3,19 @@
    # 2.If any new code changes in Ed-Fi-ODS/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj project which interacts with ODS/API Solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj  Project.
 
-name: Lib EdFi.Ods.Api Manually triggered build
+name: Lib EdFi.Ods.Api
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-52"
+  BUILD_INCREMENTER: "2"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj" -PackageName  "EdFi.Suite3.Ods.Api"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj" -PackageName  "EdFi.Suite3.Ods.Api"
       shell: pwsh
diff --git a/.github/workflows/Lib edFi.ods.common pullrequest.yml b/.github/workflows/Lib edFi.ods.common pullrequest.yml
deleted file mode 100644
index cbd649fd65..0000000000
--- a/.github/workflows/Lib edFi.ods.common pullrequest.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Lib EdFi.Ods.Common Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Application/EdFi.Ods.Common/EdFi.Ods.Common.sln"
-      shell: pwsh        
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -Solution "Application/EdFi.Ods.Common/EdFi.Ods.Common.sln" -ProjectFile "Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Application/EdFi.Ods.Common/EdFi.Ods.Common.sln" -ProjectFile "Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.ods.common manual.yml b/.github/workflows/Lib edFi.ods.common.yml
similarity index 91%
rename from .github/workflows/Lib edFi.ods.common manual.yml
rename to .github/workflows/Lib edFi.ods.common.yml
index ad2ea0f2e0..8b03f06c9c 100644
--- a/.github/workflows/Lib edFi.ods.common manual.yml	
+++ b/.github/workflows/Lib edFi.ods.common.yml	
@@ -3,14 +3,19 @@
    # 2.If any new code changes in Ed-Fi-ODS/Application/EdFi.Ods.Api/EdFi.Ods.Common.csproj project which interacts with ODS/API Solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj  Project.
 
-name: Lib EdFi.Ods.Common Manually triggered build
+name: Lib EdFi.Ods.Common
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-20"
+  BUILD_INCREMENTER: "3"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Ods.Common/EdFi.Ods.Common.sln" -ProjectFile "Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj" -PackageName "EdFi.Suite3.Ods.Common"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Application/EdFi.Ods.Common/EdFi.Ods.Common.sln" -ProjectFile "Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj"  -PackageName "EdFi.Suite3.Ods.Common"
       shell: pwsh
diff --git a/.github/workflows/Lib edFi.ods.standard pullrequest.yml b/.github/workflows/Lib edFi.ods.standard pullrequest.yml
deleted file mode 100644
index c277cb9f14..0000000000
--- a/.github/workflows/Lib edFi.ods.standard pullrequest.yml	
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Lib EdFi.Ods.Standard Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "1"
-  CONFIGURATION: "Release"
-  HEAD_REF:  ${{ GITHUB.HEAD_REF }}
-  REF_NAME:  ${{ GITHUB.REF_NAME }}
-  REPOSITORY_DISPATCH_BRANCH: ${{ github.event.client_payload.branch }}  
-
-jobs:
-  FindStandardAndExtensionVersions:
-    uses: ./.github/workflows/Find Standard and Extension Versions.yml
-    with:
-      calling_branch: ${{ github.head_ref || github.ref_name }}
-
-  build:
-    if: ${{ always() }}
-    needs: FindStandardAndExtensionVersions
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }}
-    name: build (Standard ${{ matrix.StandardVersion }})         
-    steps:
-    - name: Checkout Ed-Fi-ODS
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-      with:
-        repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
-        path: Ed-Fi-ODS/
-    - name: Checkout Ed-Fi-ODS-Implementation
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-      with:
-        repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation
-        path: Ed-Fi-ODS-Implementation/
-    - name: Is pull request branch exists in Ed-Fi-ODS-Implementation
-      working-directory: ./Ed-Fi-ODS/
-      shell: pwsh
-      run: |
-        .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-ODS-Implementation"
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      working-directory: ./Ed-Fi-ODS/
-      run: |
-        .\build.githubactions.ps1 restore -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj"
-      shell: pwsh        
-    - name: CodeGen    
-      working-directory: ./Ed-Fi-ODS/
-      shell: pwsh
-      run: |
-          $ErrorActionPreference = 'Stop'
-          $PSVersionTable
-          . $env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1
-          Invoke-CodeGen -Engine SQLServer -RepositoryRoot $env:GITHUB_WORKSPACE  -StandardVersion ${{ matrix.StandardVersion }}
-    - name: build
-      working-directory: ./Ed-Fi-ODS/
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}}  -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj"   -StandardVersion ${{ matrix.StandardVersion }}
-      shell: pwsh
-    - name: Run Unit tests
-      working-directory: ./Ed-Fi-ODS/
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }}  -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj"
-      shell: pwsh     
-
-          
-
-    
\ No newline at end of file
diff --git a/.github/workflows/Lib edFi.ods.standard manual.yml b/.github/workflows/Lib edFi.ods.standard.yml
similarity index 93%
rename from .github/workflows/Lib edFi.ods.standard manual.yml
rename to .github/workflows/Lib edFi.ods.standard.yml
index 83d9f9c40f..818a513ed2 100644
--- a/.github/workflows/Lib edFi.ods.standard manual.yml	
+++ b/.github/workflows/Lib edFi.ods.standard.yml	
@@ -3,14 +3,19 @@
    # 2.If any new database changes which related to ODS Core Standard in /Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj which interacts with EDFI_ODS Database.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj  Project.
 
-name: Lib EdFi.Ods.Standard Manually triggered build
+name: Lib EdFi.Ods.Standard
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-19"
+  BUILD_INCREMENTER: "3"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -101,13 +106,13 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}}  -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj" -PackageName  "EdFi.Suite3.Ods.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj" -PackageName  "EdFi.Suite3.Ods.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Lib edFi.security.dataaccess pullrequest.yml b/.github/workflows/Lib edFi.security.dataaccess pullrequest.yml
deleted file mode 100644
index 9cceca3f57..0000000000
--- a/.github/workflows/Lib edFi.security.dataaccess pullrequest.yml	
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Lib EdFi.Security.DataAccess Pull request build and test
-
-on:
-  pull_request:
-    branches: [main, 'ODS-*']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "1"
-  CONFIGURATION: "Release"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # 2.1.0
-      with:
-        dotnet-version: 6.0.x
-    - name: Cache Nuget packages       
-      uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj*', '**/configuration.packages.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-    - name: Restore NuGet packages
-      run: |
-        .\build.githubactions.ps1 restore -Solution "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.sln"
-      shell: pwsh        
-    - name: build
-      run: |
-        .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.sln" -ProjectFile "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj"
-      shell: pwsh
-    - name: Run Unit tests
-      run: |
-        .\build.githubactions.ps1 test -Configuration ${{ env.CONFIGURATION }} -Solution "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.sln" -ProjectFile "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj"
-      shell: pwsh
diff --git a/.github/workflows/Lib edFi.security.dataaccess manual.yml b/.github/workflows/Lib edFi.security.dataaccess.yml
similarity index 91%
rename from .github/workflows/Lib edFi.security.dataaccess manual.yml
rename to .github/workflows/Lib edFi.security.dataaccess.yml
index 5d1bd7aa1f..741a75bb3c 100644
--- a/.github/workflows/Lib edFi.security.dataaccess manual.yml	
+++ b/.github/workflows/Lib edFi.security.dataaccess.yml	
@@ -3,14 +3,19 @@
    # 2.If any new public method get added/modified in Repository class of Ed-Fi-ODS\Application\EdFi.Security.DataAccess project which interacts with EdFi_Security Database.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS\Application\EdFi.Security.DataAccess project
 
-name: Lib EdFi.Security.DataAccess Manually triggered build
+name: Lib EdFi.Security.DataAccess
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-34"
+  BUILD_INCREMENTER: "6"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.sln" -ProjectFile "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj" -PackageName  "EdFi.Suite3.Security.DataAccess"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -Solution "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.sln" -ProjectFile "Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj" -PackageName  "EdFi.Suite3.Security.DataAccess"
       shell: pwsh      
diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml
index 443eeeb14f..3631666ea4 100644
--- a/.github/workflows/Pkg EdFi.Database.Admin.yml	
+++ b/.github/workflows/Pkg EdFi.Database.Admin.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Database.Admin
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   workflow_dispatch:
@@ -116,11 +115,11 @@ jobs:
         nuget pack $AdminBACPACNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
         nuget pack $AdminPostgreSQLNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: iex "& { $(irm https://aka.ms/install-artifacts-credprovider.ps1) } -AddNetfx"
       shell: powershell
     - name: Publish Nuget package
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Admin.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Pkg EdFi.Database.Security.yml b/.github/workflows/Pkg EdFi.Database.Security.yml
index 63df06b208..d419bcbe57 100644
--- a/.github/workflows/Pkg EdFi.Database.Security.yml	
+++ b/.github/workflows/Pkg EdFi.Database.Security.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Database.Security
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   workflow_dispatch:
@@ -116,12 +115,12 @@ jobs:
         nuget pack $SecurityBACPACNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
         nuget pack $SecurityPostgreSQLNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: iex "& { $(irm https://aka.ms/install-artifacts-credprovider.ps1) } -AddNetfx"
       shell: powershell
     - name: Publish Nuget package
       working-directory: ./Ed-Fi-ODS/
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Security.Standard.${{ matrix.StandardVersion }}"
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Security.BACPAC.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml
index 50fc071785..ca2962d3a4 100644
--- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml	
@@ -2,10 +2,9 @@ name: Pkg EdFi.Ods.CodeGen
 
 on:
   pull_request:
-    branches: [main, 'ODS-*']
+    branches: [main, 'b-v*-patch*','feature-*']
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -116,13 +115,13 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj" -PackageName "EdFi.Suite3.Ods.CodeGen"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh    
     - name: publish codegen
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -ProjectFile "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj" -PackageName "EdFi.Suite3.Ods.CodeGen"
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
index 10064504c7..f65334880a 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Minimal.Template.PostgreSQL
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -62,6 +61,7 @@ jobs:
     steps:
     - name: echo distinct ID ${{ github.event.inputs.distinct_id }}
       run:  echo "${{ github.event.inputs.distinct_id }}"
+     
     - name: Check for Azure token
       if: ${{ env.REPOSITORY_OWNER == 'Ed-Fi-Alliance-OSS' && env.AZURE_ARTIFACT_NUGET_KEY == '' }}
       run: | 
@@ -148,14 +148,14 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName "EdFi.Suite3.Ods.Minimal.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh     
     - name: publish 
       working-directory: ./Ed-Fi-ODS/
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Minimal.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml
index 143e1aa4a7..7a4e94d2c8 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -155,14 +154,14 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName "EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh     
     - name: publish 
       working-directory: ./Ed-Fi-ODS/
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml
index a290fc0da8..6cefa9e3a6 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Minimal.Template.TPDM
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -149,7 +148,7 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName  "EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}"
       shell: powershell
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS-Implementation/
       run: |
          Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/logistics/scripts/modules/utility/cross-platform.psm1"
@@ -183,7 +182,7 @@ jobs:
       shell: powershell
     - name: publish 
       working-directory: ./Ed-Fi-ODS/
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}"
       shell: powershell      
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml
index d04a815652..d265a2e548 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Minimal.Template
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -141,7 +140,7 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName  "EdFi.Suite3.Ods.Minimal.Template.Standard.${{ matrix.StandardVersion }}" 
       shell: powershell
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS-Implementation/
       run: |
          Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/logistics/scripts/modules/utility/cross-platform.psm1"
@@ -175,7 +174,7 @@ jobs:
       shell: powershell
     - name: publish 
       working-directory: ./Ed-Fi-ODS/
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Minimal.Template.Standard.${{ matrix.StandardVersion }}"
       shell: powershell      
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml
index 9492847499..57de11d121 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Populated.Template.PostgreSQL
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -148,13 +147,13 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName "EdFi.Suite3.Ods.Populated.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh    
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Populated.Template.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml
index afd9469927..471700d908 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -154,13 +153,13 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName "EdFi.Suite3.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.PostgreSQL.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml
index a123eff833..697db88484 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Populated.Template.TPDM
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -149,7 +148,7 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName  "EdFi.Suite3.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}"
       shell: powershell
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS-Implementation/
       run: |
          Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/logistics/scripts/modules/utility/cross-platform.psm1"
@@ -182,7 +181,7 @@ jobs:
           }
       shell: powershell
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Populated.Template.TPDM.Core.${{ matrix.ExtensionVersion }}.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml
index b48a21f5be..73b21361f2 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml	
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.Populated.Template
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
     inputs:
       distinct_id:
@@ -141,7 +140,7 @@ jobs:
         .\build.githubactions.ps1 pack -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuspecFilePath "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.Standard.${{ matrix.StandardVersion }}.nuspec" -PackageName  "EdFi.Suite3.Ods.Populated.Template.Standard.${{ matrix.StandardVersion }}" 
       shell: powershell
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS-Implementation/
       run: |
          Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/logistics/scripts/modules/utility/cross-platform.psm1"
@@ -174,7 +173,7 @@ jobs:
           }
       shell: powershell
     - name: publish 
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Suite3.Ods.Populated.Template.Standard.${{ matrix.StandardVersion }}"
diff --git a/.github/workflows/Trgr InitDev workflows in Implementation repo.yml b/.github/workflows/Trgr InitDev workflows in Implementation repo.yml
index ce47f61598..df0e3c7fbb 100644
--- a/.github/workflows/Trgr InitDev workflows in Implementation repo.yml	
+++ b/.github/workflows/Trgr InitDev workflows in Implementation repo.yml	
@@ -2,7 +2,7 @@ name: Trgr InitDev workflows in Implementation repo
 
 on:
   pull_request:
-    branches: [main, 'ODS-*']
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
 
 concurrency: