diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 439280b436..be06cf1a4b 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -72,10 +72,10 @@ jobs:
           fi;
 
           # Control which images to build
-          echo "BUILD_ALLINONE=${{ inputs.build_allinone || false }}" >> "${GITHUB_ENV}"
-          echo "BUILD_FRONTEND=${{ inputs.build_frontend || false }}" >> "${GITHUB_ENV}"
-          echo "BUILD_NODESERVICE=${{ inputs.build_nodeservice || false }}" >> "${GITHUB_ENV}"
-          echo "BUILD_APISERVICE=${{ inputs.build_apiservice || false }}" >> "${GITHUB_ENV}"
+          echo "BUILD_ALLINONE=${{ inputs.build_allinone || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_FRONTEND=${{ inputs.build_frontend || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_NODESERVICE=${{ inputs.build_nodeservice || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_APISERVICE=${{ inputs.build_apiservice || true }}" >> "${GITHUB_ENV}"
 
           # Image names
           ALLINONE_IMAGE_NAMES=lowcoderorg/lowcoder-ce:${IMAGE_TAG}
diff --git a/client/packages/lowcoder/src/comps/queries/sqlQuery/columnNameDropdown.tsx b/client/packages/lowcoder/src/comps/queries/sqlQuery/columnNameDropdown.tsx
index e33be20bde..d79c00a781 100644
--- a/client/packages/lowcoder/src/comps/queries/sqlQuery/columnNameDropdown.tsx
+++ b/client/packages/lowcoder/src/comps/queries/sqlQuery/columnNameDropdown.tsx
@@ -1,6 +1,6 @@
 import { DispatchType } from "lowcoder-core";
 import { ControlPlacement } from "../../controls/controlParams";
-import React, { useContext } from "react";
+import React, { useContext, useState, useEffect } from "react";
 import { Dropdown, OptionsType } from "lowcoder-design";
 import { isEmpty, values } from "lodash";
 import { useSelector } from "react-redux";
@@ -8,6 +8,8 @@ import { getDataSourceStructures } from "../../../redux/selectors/datasourceSele
 import { changeValueAction } from "lowcoder-core";
 import { QueryContext } from "../../../util/context/QueryContext";
 
+const COLUMN_SORT_KEY = "lowcoder_column_sort";
+
 export const ColumnNameDropdown = (props: {
   table: string;
   value: string;
@@ -18,13 +20,27 @@ export const ColumnNameDropdown = (props: {
 }) => {
   const context = useContext(QueryContext);
   const datasourceId = context?.datasourceId ?? "";
-  const columns: OptionsType =
-    values(useSelector(getDataSourceStructures)[datasourceId])
-      ?.find((t) => t.name === props.table)
-      ?.columns.map((column) => ({
-        label: column.name,
-        value: column.name,
-      })) ?? [];
+  
+  // Simple sort preference from localStorage
+  const [sortColumns, setSortColumns] = useState(() => {
+    return localStorage.getItem(COLUMN_SORT_KEY) === 'true';
+  });
+
+  useEffect(() => {
+    localStorage.setItem(COLUMN_SORT_KEY, sortColumns.toString());
+  }, [sortColumns]);
+
+  const rawColumns = values(useSelector(getDataSourceStructures)[datasourceId])
+    ?.find((t) => t.name === props.table)
+    ?.columns.map((column) => ({
+      label: column.name,
+      value: column.name,
+    })) ?? [];
+
+  const columns: OptionsType = sortColumns 
+    ? [...rawColumns].sort((a, b) => a.label.localeCompare(b.label))
+    : rawColumns;
+
   return (
     <Dropdown
       options={columns}
@@ -34,6 +50,20 @@ export const ColumnNameDropdown = (props: {
       allowClear={true}
       placement={props.placement}
       label={props.label}
+      showSearch={true}
+      preNode={() => (
+        <div style={{ padding: '4px 8px', borderBottom: '1px solid #f0f0f0' }}>
+          <label style={{ fontSize: '12px', cursor: 'pointer', userSelect: 'none' }}>
+            <input
+              type="checkbox"
+              checked={sortColumns}
+              onChange={(e) => setSortColumns(e.target.checked)}
+              style={{ marginRight: '6px' }}
+            />
+            Sort A-Z
+          </label>
+        </div>
+      )}
     />
   );
 };