diff --git a/build/prepare_test_container.sh b/build/prepare_test_container.sh
index f4cae8cdd..590eb2391 100755
--- a/build/prepare_test_container.sh
+++ b/build/prepare_test_container.sh
@@ -130,7 +130,8 @@ prepare_container() {
     if [[ "$RESULT" == *rocky* ]]; then
         execInnerDockerWithRetry "$CONTAINER_NAME" 'yum install -y MariaDB-columnstore-engine MariaDB-test'
     else
-        execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data mariadb-plugin-columnstore-dbgsym'
+        #TODO think about server version!
+        execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data mariadb-plugin-columnstore-dbgsym mariadb-client-10.6-dbgsym mariadb-client-core-10.6-dbgsym mariadb-server-10.6-dbgsym mariadb-server-core-10.6-dbgsym mariadb-test-dbgsym '
     fi
 
     sleep 5
diff --git a/dbcon/mysql/is_columnstore_columns.cpp b/dbcon/mysql/is_columnstore_columns.cpp
index d5bc8acaf..4039c87f2 100644
--- a/dbcon/mysql/is_columnstore_columns.cpp
+++ b/dbcon/mysql/is_columnstore_columns.cpp
@@ -62,12 +62,25 @@ static int is_columnstore_columns_fill(THD* thd, TABLE_LIST* tables, COND* cond)
   InformationSchemaCond isCond;
 
   execplan::CalpontSystemCatalog csc;
-  const std::vector<
-      std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
-      catalog_tables = csc.getTables();
-
+  // Use FE path for syscat queries issued from mysqld
   csc.identity(execplan::CalpontSystemCatalog::FE);
 
+  std::vector<
+      std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
+      catalog_tables;
+  try
+  {
+    catalog_tables = csc.getTables("", lower_case_table_names);
+  }
+  catch (IDBExcept&)
+  {
+    return 1;
+  }
+  catch (std::exception&)
+  {
+    return 1;
+  }
+
   if (cond)
   {
     isCond.getCondItems(cond);