diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
index a7d975bb6..6d890aa1a 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js
@@ -647,8 +647,44 @@ export default class Datatable extends LightningElement {
     dateFieldArray = [];
     datetimeFieldArray = [];
     @api picklistFieldArray = [];
-    @api picklistReplaceValues = false;     
-    apex_picklistFieldMap = [];
+    @api picklistReplaceValues = false;
+    @api
+    get apex_picklistFieldMap() {
+        return this._apex_picklistFieldMap || {};
+    }
+    set apex_picklistFieldMap(value) {
+        try {
+            const isValidString = (typeof value === 'string' && value?.trim()?.length > 0);
+            this._apex_picklistFieldMap = (isValidString) ? this.convertPicklistFormat(JSON.parse(value)) : [];
+        } catch (e) {
+            console.log('Error parsing apex_picklistFieldMap JSON:', e);
+            this._apex_picklistFieldMap = [];
+        }
+    }
+    _apex_picklistFieldMap = {};
+
+    convertPicklistFormat(picklistMap) {
+        // Convert from user-friendly format: {"fieldName": [{"label":"...", "value":"..."}]}
+        // To internal format: {"fieldName": {"label": "value"}}
+        const converted = {};
+        Object.keys(picklistMap).forEach(fieldName => {
+            const fieldValues = picklistMap[fieldName];
+            if (Array.isArray(fieldValues)) {
+                // Convert array format to object format
+                converted[fieldName] = {};
+                fieldValues?.forEach(item => {
+                    if (item?.label && item?.hasOwnProperty('value')) {
+                        converted[fieldName][item?.label] = item?.value;
+                    }
+                });
+            } else {
+                // Already in internal format, use as-is
+                converted[fieldName] = fieldValues;
+            }
+        });
+        return converted;
+    }
+
     @api picklistMap = [];
     @api edits = [];
     @api isEditAttribSet = false;
@@ -1354,11 +1390,13 @@ export default class Datatable extends LightningElement {
                 if (this.picklistReplaceValues) {
                     let noMatch = false;
                     this.picklistFieldArray.forEach(picklist => {
-                        Object.keys(this.apex_picklistFieldMap[picklist]).forEach(map => {                         
-                            if (map != this.apex_picklistFieldMap[picklist][map]) {                              
-                                noMatch = true;
-                            }
-                        });
+                        if (this.picklistFieldMap[picklist]) {
+                            Object.keys(this.picklistFieldMap[picklist]).forEach(map => {
+                                if (map != this.picklistFieldMap[picklist][map]) {
+                                    noMatch = true;
+                                }
+                            });
+                        }
                     });
                     this.picklistReplaceValues = noMatch;
                 }
@@ -1518,10 +1556,10 @@ export default class Datatable extends LightningElement {
             // Handle replacement of Picklist API Names with Labels
             if (this.picklistReplaceValues) {
                 picklistFields.forEach(picklist => {
-                    if (record[picklist]) {
+                    if (record[picklist] && this.picklistFieldMap[picklist]) {
                         let picklistLabels = [];
-                        record[picklist].split(';').forEach(picklistValue => {                    
-                            picklistLabels.push(this.apex_picklistFieldMap[picklist][picklistValue]);
+                        record[picklist].split(';').forEach(picklistValue => {
+                            picklistLabels.push(this.picklistFieldMap[picklist][picklistValue]);
                         });
                         record[picklist] = picklistLabels.join(';');
                     }
@@ -1713,6 +1751,16 @@ export default class Datatable extends LightningElement {
                         this.typeAttrib = [];
                         this.typeAttrib.type = type;
                     }
+
+                    // Convert 'picklist' to 'combobox' if picklist values are available (from apex or wire service)
+                    if (this.typeAttrib.type === 'picklist') {
+                        const hasApexPicklistValues = this.apex_picklistFieldMap && this.apex_picklistFieldMap[fieldName];
+                        const hasWirePicklistValues = this._picklistData && this._picklistData.picklistFieldValues && this._picklistData.picklistFieldValues[fieldName];
+                        if (hasApexPicklistValues || hasWirePicklistValues) {
+                            this.typeAttrib.type = 'combobox';
+                            type = 'combobox';
+                        }
+                    }
                 }
             }
 
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
index 864c8bda6..a3f2b4d91 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/datatable/datatable.js-meta.xml
@@ -39,6 +39,7 @@
             <property name="serializedRecordData" label="_ (User Defined)  Display Serialized Record?" type="String" default="false" role="inputOnly" description="String variable containing the records. Serialized record data."/>
             <property name="isSerializedRecordData" type="Boolean" role="inputOnly"/>
             <property name="cb_isSerializedRecordData" type="String" role="inputOnly"/>
+            <property name="apex_picklistFieldMap" label="_ (User Defined) Picklist Field Map" type="String" role="inputOnly" description="JSON string containing picklist values for user-defined objects."/>
             <!-- =========== Outputs =========== -->
             <property name="outputSelectedRowsString" label="Output Selected Rows (User Defined)" type="String" role="outputOnly" description="Object Collection string variable to contain only the records that were selected in the datatable. 
                 --  NOTE: These records may not contain all of the edited values."/>
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
index 54a6cfc36..8fc48f084 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.html
@@ -782,6 +782,22 @@ <h2 class="slds-modal__title slds-hyphenate">Configure Columns</h2>
                 automatic-output-variables={automaticOutputVariables}>
             </c-fsc_flow-combobox>
 
+            <!-- Picklist Field Map (Apex-Defined) -->
+            <c-fsc_flow-combobox
+                if:false={isSObjectInput}
+                name="select_apex_picklistFieldMap"
+                label={inputValues.apex_picklistFieldMap.label}
+                value={inputValues.apex_picklistFieldMap.value}
+                value-type={inputValues.apex_picklistFieldMap.valueDataType}
+                field-level-help={inputValues.apex_picklistFieldMap.helpText}
+                builder-context-filter-collection-boolean={inputValues.apex_picklistFieldMap.isCollection}
+                builder-context={_builderContext}
+                allow-hard-code-reference=true
+                placeholder-text="Manual entry allowed"
+                onvaluechanged={handleFlowComboboxValueChange}
+                automatic-output-variables={automaticOutputVariables}>
+            </c-fsc_flow-combobox>
+
             <!-- Special Column CellAttribs -->
             <c-fsc_flow-combobox 
                 name="select_columnCellAttribs" 
diff --git a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
index b05af4d3e..50ba795dd 100644
--- a/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
+++ b/flow_screen_components/datatable/force-app/main/default/lwc/ers_datatableCPE/ers_datatableCPE.js
@@ -519,8 +519,10 @@ export default class ers_datatableCPE extends LightningElement {
             helpText: 'Record Collection variable containing the records to show as pre-selected in the datatable.'},
         tableDataString: {value: null, valueDataType: null, isCollection: false, label: 'Datatable Record String', 
             helpText: 'Object Collection string variable containing the records to display in the datatable.'},
-        preSelectedRowsString: {value: null, valueDataType: null, isCollection: false, label: 'Pre-Selected Rows String', 
+        preSelectedRowsString: {value: null, valueDataType: null, isCollection: false, label: 'Pre-Selected Rows String',
             helpText: 'Object Collection string variable containing the records to show as pre-selected in the datatable.'},
+        apex_picklistFieldMap: {value: null, valueDataType: null, isCollection: false, label: 'Column Picklist Values (Apex-Defined Only)',
+            helpText: 'JSON string containing picklist values for user-defined objects. Format: {"fieldName":[{"label":"Label1","value":"Value1"}]}'},
         columnFields: {value: null, valueDataType: null, isCollection: false, label: 'Column Fields', 
             helpText: "REQUIRED: Comma separated list of field API Names to display in the datatable.",
             isError: false, errorMessage: null},  
@@ -802,6 +804,7 @@ export default class ers_datatableCPE extends LightningElement {
                 {name: 'columnFlexes'},
                 {name: 'columnWraps'},
                 {name: 'columnCellAttribs'},
+                {name: 'apex_picklistFieldMap'},
                 {name: 'columnTypeAttribs'},
                 {name: 'columnOtherAttribs'},
                 {name: 'recordTypeId'},