diff --git a/.github/composite-actions/build-modified-postgres/action.yml b/.github/composite-actions/build-modified-postgres/action.yml
index 90c571ed19c..0df0c007246 100644
--- a/.github/composite-actions/build-modified-postgres/action.yml
+++ b/.github/composite-actions/build-modified-postgres/action.yml
@@ -50,11 +50,13 @@ runs:
         fi
 
         # Function to compare versions correctly
-        version_lt() {
+        version_le() {
           printf "%s\n%s" "$1" "$2" | sort -V | head -n1 | grep -q "^$1$"
         }
+        # Use gcc-9 for versions prior to 14.18 and 15.13
         engine_version="${{ inputs.engine_version }}"
-        if [[ "$engine_version" != "source.latest" && "$engine_version" != "target.latest" ]] && version_lt "$engine_version" "17.5"; then
+        if [[ "$engine_version" != "source.latest" && "$engine_version" != "target.latest" ]] && 
+          ( version_le "$engine_version" "14.17" || ( [[ "${engine_version%%.*}" == "15" ]] && version_le "$engine_version" "15.12" ) ); then
           export CC='ccache gcc-9'
         else
           export CC='ccache gcc'
diff --git a/test/odbc/psqlodbc/test/tinyint.cpp b/test/odbc/psqlodbc/test/tinyint.cpp
index eb35f05350a..ad252a8640b 100644
--- a/test/odbc/psqlodbc/test/tinyint.cpp
+++ b/test/odbc/psqlodbc/test/tinyint.cpp
@@ -335,7 +335,8 @@ TEST_F(PSQL_DataTypes_TinyInt, View_Creation) {
   dropObject(ServerType::PSQL, "TABLE", TABLE_NAME);
 }
 
-TEST_F(PSQL_DataTypes_TinyInt, Table_Unique_Constraints) {
+// TODO: Re-enable when fixed
+TEST_F(PSQL_DataTypes_TinyInt, DISABLED_Table_Unique_Constraints) {
   const vector<pair<string, string>> TABLE_COLUMNS = {
     {COL1_NAME, "INT"},
     {COL2_NAME, DATATYPE_NAME}