diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml
index 03f8a68946..4bd823db91 100644
--- a/.github/workflows/Pkg EdFi.Database.Admin.yml	
+++ b/.github/workflows/Pkg EdFi.Database.Admin.yml	
@@ -84,10 +84,10 @@ jobs:
       run: |
           choco install sql-server-2019  -y --params "'/IGNOREPENDINGREBOOT /IACCEPTSQLSERVERLICENSETERMS /Q /ACTION=install /INSTANCEID=MSSQLSERVER /INSTANCENAME=MSSQLSERVER /TCPENABLED=1 /UPDATEENABLED=FALSE /FEATURES=SQL,Tools'" --execution-timeout=$installTimeout
           choco install sqlpackage
-          choco install postgresql13 --params '/Password:${{ env.POSTGRES_PASSWORD }}'
-          $confPath = "C:\Program Files\PostgreSQL\13\data\pg_hba.conf"
+          choco install postgresql16 --params '/Password:${{ env.POSTGRES_PASSWORD }}'
+          $confPath = "C:\Program Files\PostgreSQL\16\data\pg_hba.conf"
           (Get-Content $confPath).Replace("scram-sha-256","trust") | Set-Content $confPath
-          Restart-Service postgresql-x64-13
+          Restart-Service postgresql-x64-16
     - name: Create Admin Database 
       shell: powershell
       run: |
diff --git a/.github/workflows/Pkg EdFi.Database.Security.yml b/.github/workflows/Pkg EdFi.Database.Security.yml
index 89fb4425a3..e9f7b82862 100644
--- a/.github/workflows/Pkg EdFi.Database.Security.yml	
+++ b/.github/workflows/Pkg EdFi.Database.Security.yml	
@@ -84,10 +84,10 @@ jobs:
       run: |
           choco install sql-server-2019  -y --params "'/IGNOREPENDINGREBOOT /IACCEPTSQLSERVERLICENSETERMS /Q /ACTION=install /INSTANCEID=MSSQLSERVER /INSTANCENAME=MSSQLSERVER /TCPENABLED=1 /UPDATEENABLED=FALSE /FEATURES=SQL,Tools'" --execution-timeout=$installTimeout
           choco install sqlpackage
-          choco install postgresql13 --params '/Password:${{ env.POSTGRES_PASSWORD }}'
-          $confPath = "C:\Program Files\PostgreSQL\13\data\pg_hba.conf"
+          choco install postgresql16 --params '/Password:${{ env.POSTGRES_PASSWORD }}'
+          $confPath = "C:\Program Files\PostgreSQL\16\data\pg_hba.conf"
           (Get-Content $confPath).Replace("scram-sha-256","trust") | Set-Content $confPath
-          Restart-Service postgresql-x64-13
+          Restart-Service postgresql-x64-16
     - name: Create Security Database 
       shell: powershell
       run: |
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
index 20099bf168..78b870747a 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
@@ -47,7 +47,7 @@ jobs:
     name: build (Standard Version ${{ matrix.StandardVersion }})
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16.3-alpine3.19@sha256:eb98285d1b37703deb53543d0d5f1b19124616bae59a6d42d1c98531f7c2677a
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         # Set health checks to wait until postgres has started
@@ -96,6 +96,15 @@ jobs:
       shell: pwsh
       run: |
         .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-ODS-Implementation"
+    - name: Install postgresql-client-16 package
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install curl ca-certificates
+        sudo install -d /usr/share/postgresql-common/pgdg
+        sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+        sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo apt-get update
+        sudo apt-get -y install postgresql-client-16
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:
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 aea2ea6281..0413ba32a1 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml	
@@ -47,7 +47,7 @@ jobs:
     name: build (Standard ${{ matrix.StandardVersion }} Extension ${{ matrix.ExtensionVersion }})
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16.3-alpine3.19@sha256:eb98285d1b37703deb53543d0d5f1b19124616bae59a6d42d1c98531f7c2677a
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         # Set health checks to wait until postgres has started
@@ -116,6 +116,15 @@ jobs:
                 echo "BUILD_INCREMENTER=$newRevision">> $env:GITHUB_ENV
             }
       shell: pwsh
+    - name: Install postgresql-client-16 package
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install curl ca-certificates
+        sudo install -d /usr/share/postgresql-common/pgdg
+        sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+        sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo apt-get update
+        sudo apt-get -y install postgresql-client-16
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml
index 4c588e13ae..b5e7a951b2 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml	
@@ -47,7 +47,7 @@ jobs:
     name: build (Standard Version ${{ matrix.StandardVersion }})
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16.3-alpine3.19@sha256:eb98285d1b37703deb53543d0d5f1b19124616bae59a6d42d1c98531f7c2677a
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         # Set health checks to wait until postgres has started
@@ -95,6 +95,15 @@ jobs:
       shell: pwsh
       run: |
         .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-ODS-Implementation"
+    - name: Install postgresql-client-16 package
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install curl ca-certificates
+        sudo install -d /usr/share/postgresql-common/pgdg
+        sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+        sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo apt-get update
+        sudo apt-get -y install postgresql-client-16
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:
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 657686f428..99208547ec 100644
--- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml	
@@ -47,7 +47,7 @@ jobs:
     name: build (Standard ${{ matrix.StandardVersion }} Extension ${{ matrix.ExtensionVersion }})
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16.3-alpine3.19@sha256:eb98285d1b37703deb53543d0d5f1b19124616bae59a6d42d1c98531f7c2677a
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         # Set health checks to wait until postgres has started
@@ -116,6 +116,15 @@ jobs:
                 echo "BUILD_INCREMENTER=$newRevision">> $env:GITHUB_ENV
             }
       shell: pwsh
+    - name: Install postgresql-client-16 package
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install curl ca-certificates
+        sudo install -d /usr/share/postgresql-common/pgdg
+        sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+        sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        sudo apt-get update
+        sudo apt-get -y install postgresql-client-16
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with: