diff --git a/.github/workflows/NativePipeline.yml b/.github/workflows/NativePipeline.yml
index a96d9f495..1394ec1c8 100644
--- a/.github/workflows/NativePipeline.yml
+++ b/.github/workflows/NativePipeline.yml
@@ -99,6 +99,9 @@ jobs:
               fi
             done
 
+            # Trim leading and trailing spaces from selected_workspaces
+            selected_workspaces=$(echo $selected_workspaces | xargs)
+
             if [[ -n "$selected_workspaces" ]]; then
               echo "scope=--all --include '$selected_workspaces'" >> $GITHUB_OUTPUT
               echo "widgets=[\"$selected_workspaces\"]" >> $GITHUB_OUTPUT
diff --git a/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md b/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
index a147a3657..105fdd72b 100644
--- a/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   We have resolved an issue preventing Bar chart from rendering correctly.
+
 ## [3.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/bar-chart-native/package.json b/packages/pluggableWidgets/bar-chart-native/package.json
index 6d98c232f..d237a58b4 100644
--- a/packages/pluggableWidgets/bar-chart-native/package.json
+++ b/packages/pluggableWidgets/bar-chart-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bar-chart-native",
   "widgetName": "BarChart",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx b/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
index e8bd11333..ccdf3f22b 100644
--- a/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
+++ b/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
@@ -58,7 +58,7 @@ export function BarChart({
     style,
     warningPrefix
 }: BarChartProps): ReactElement | null {
-    const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+    const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
 
     const warningMessagePrefix = useMemo(() => (warningPrefix ? warningPrefix + "i" : "I"), [warningPrefix]);
 
@@ -133,16 +133,7 @@ export function BarChart({
         }
 
         return <VictoryStack colorScale={normalizedBarColors}>{bars}</VictoryStack>;
-    }, [
-        dataTypesResult,
-        series,
-        style,
-        warningMessagePrefix,
-        sortProps,
-        showLabels,
-        normalizedBarColors,
-        presentation
-    ]);
+    }, [dataTypesResult, series, style, sortProps, showLabels, normalizedBarColors, presentation]);
 
     const [firstSeries] = series;
 
@@ -195,8 +186,8 @@ export function BarChart({
         (event: LayoutChangeEvent) => {
             const { height, width } = event.nativeEvent.layout;
             setChartDimensions({
-                height: height <= 0 ? -1 : height,
-                width: width <= 0 ? -1 : width
+                height: height <= 0 ? undefined : height,
+                width: width <= 0 ? undefined : width
             });
         },
         [setChartDimensions]
@@ -222,8 +213,8 @@ export function BarChart({
                                     // horizontal charts.
                                     <VictoryChart
                                         domainPadding={{ x: style.domain?.padding?.y, y: style.domain?.padding?.x }}
-                                        height={chartDimensions?.height}
-                                        width={chartDimensions?.width}
+                                        height={chartDimensions.height}
+                                        width={chartDimensions.width}
                                         padding={aggregateGridPadding(style.grid)}
                                         scale={
                                             dataTypesResult
diff --git a/packages/pluggableWidgets/bar-chart-native/src/package.xml b/packages/pluggableWidgets/bar-chart-native/src/package.xml
index 4b69e006b..7e68f416d 100644
--- a/packages/pluggableWidgets/bar-chart-native/src/package.xml
+++ b/packages/pluggableWidgets/bar-chart-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="BarChart" version="3.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="BarChart" version="3.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="BarChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/column-chart-native/CHANGELOG.md b/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
index 435f89e9d..7539b4e6a 100644
--- a/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   We have resolved an issue preventing Column chart from rendering correctly
+
 ## [2.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/column-chart-native/package.json b/packages/pluggableWidgets/column-chart-native/package.json
index c763e9e1d..0ce160a44 100644
--- a/packages/pluggableWidgets/column-chart-native/package.json
+++ b/packages/pluggableWidgets/column-chart-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "column-chart-native",
   "widgetName": "ColumnChart",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx b/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
index 53f5ad7b3..76a8debbe 100644
--- a/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
+++ b/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
@@ -66,7 +66,7 @@ export function ColumnChart({
         return sortSeriesDataPoints(series, sortOrder, dataTypesResult);
     }, [sortOrder, series, dataTypesResult]);
 
-    const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+    const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
 
     // Column Chart user-styling may be missing for certain series. A palette is passed, any missing colours
     // fallback to a colour from the palette.
@@ -153,8 +153,8 @@ export function ColumnChart({
         (event: LayoutChangeEvent) => {
             const { height, width } = event.nativeEvent.layout;
             setChartDimensions({
-                height: height <= 0 ? -1 : height,
-                width: width <= 0 ? -1 : width
+                height: height <= 0 ? undefined : height,
+                width: width <= 0 ? undefined : width
             });
         },
         [setChartDimensions]
@@ -178,10 +178,8 @@ export function ColumnChart({
                                 {chartDimensions ? (
                                     <VictoryChart
                                         domainPadding={{ x: style.domain?.padding?.x, y: style.domain?.padding?.y }}
-                                        // width and height can't be zero
-                                        // TODO: this needs to be checked for bar chart
-                                        height={chartDimensions?.height || undefined}
-                                        width={chartDimensions?.width || undefined}
+                                        height={chartDimensions.height}
+                                        width={chartDimensions.width}
                                         padding={aggregateGridPadding(style.grid)}
                                         scale={
                                             dataTypesResult
diff --git a/packages/pluggableWidgets/column-chart-native/src/package.xml b/packages/pluggableWidgets/column-chart-native/src/package.xml
index b6215ae5b..001a31d50 100644
--- a/packages/pluggableWidgets/column-chart-native/src/package.xml
+++ b/packages/pluggableWidgets/column-chart-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ColumnChart" version="2.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ColumnChart" version="2.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ColumnChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/line-chart-native/CHANGELOG.md b/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
index a352001e7..41b80d5cb 100644
--- a/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   We have resolved an issue preventing Line chart from rendering correctly
+
 ## [3.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/line-chart-native/package.json b/packages/pluggableWidgets/line-chart-native/package.json
index e88ec8182..5ad8fd072 100644
--- a/packages/pluggableWidgets/line-chart-native/package.json
+++ b/packages/pluggableWidgets/line-chart-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "line-chart-native",
   "widgetName": "LineChart",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx b/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
index 86a030b3c..9324d1e9e 100644
--- a/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
+++ b/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
@@ -177,12 +177,12 @@ export function LineChart(props: LineChartProps): ReactElement | null {
     const xAxisLabelComponent = xAxisLabel ? <Text style={axisLabelStyles.xAxisLabelStyle}>{xAxisLabel}</Text> : null;
     const yAxisLabelComponent = yAxisLabel ? <Text style={axisLabelStyles.yAxisLabelStyle}>{yAxisLabel}</Text> : null;
 
-    const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+    const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
 
     const updateChartDimensions = useCallback(
         (event: LayoutChangeEvent) => {
             const { height, width } = event.nativeEvent.layout;
-            setChartDimensions({ height: height <= 0 ? -1 : height, width: width <= 0 ? -1 : width });
+            setChartDimensions({ height: height <= 0 ? undefined : height, width: width <= 0 ? undefined : width });
         },
         [setChartDimensions]
     );
@@ -205,8 +205,8 @@ export function LineChart(props: LineChartProps): ReactElement | null {
                             <View onLayout={updateChartDimensions} style={{ flex: 1 }}>
                                 {chartDimensions ? (
                                     <VictoryChart
-                                        height={chartDimensions?.height}
-                                        width={chartDimensions?.width}
+                                        height={chartDimensions.height}
+                                        width={chartDimensions.width}
                                         padding={aggregateGridPadding(style.grid)}
                                         scale={
                                             dataTypesResult
diff --git a/packages/pluggableWidgets/line-chart-native/src/package.xml b/packages/pluggableWidgets/line-chart-native/src/package.xml
index fd1b58bd3..380d4bbaf 100644
--- a/packages/pluggableWidgets/line-chart-native/src/package.xml
+++ b/packages/pluggableWidgets/line-chart-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="LineChart" version="3.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="LineChart" version="3.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="LineChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/maps-native/CHANGELOG.md b/packages/pluggableWidgets/maps-native/CHANGELOG.md
index 6316ee2f3..0dc851fe6 100644
--- a/packages/pluggableWidgets/maps-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/maps-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   We fixed an issue where non interactive map was flickering on Android platform
+
 ## [5.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/maps-native/package.json b/packages/pluggableWidgets/maps-native/package.json
index 5267256fc..eecf6f9d5 100644
--- a/packages/pluggableWidgets/maps-native/package.json
+++ b/packages/pluggableWidgets/maps-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "maps-native",
   "widgetName": "Maps",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/pluggableWidgets/maps-native/src/Maps.tsx b/packages/pluggableWidgets/maps-native/src/Maps.tsx
index 6c37991e2..d547a8f19 100644
--- a/packages/pluggableWidgets/maps-native/src/Maps.tsx
+++ b/packages/pluggableWidgets/maps-native/src/Maps.tsx
@@ -88,7 +88,7 @@ export class Maps extends Component<Props, State> {
                         zoomEnabled={this.props.interactive}
                         style={{ flex: 1, alignSelf: "stretch" }}
                         liteMode={!this.props.interactive}
-                        cacheEnabled={!this.props.interactive}
+                        cacheEnabled={false}
                         showsPointsOfInterest={false}
                         mapPadding={{ top: 48, right: 48, bottom: 48, left: 48 }}
                         onMapReady={this.onMapReadyHandler}
diff --git a/packages/pluggableWidgets/maps-native/src/package.xml b/packages/pluggableWidgets/maps-native/src/package.xml
index 734fbcd76..43591513d 100644
--- a/packages/pluggableWidgets/maps-native/src/package.xml
+++ b/packages/pluggableWidgets/maps-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Maps" version="5.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Maps" version="5.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Maps.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md b/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
index 881b6116c..3fe71c6c6 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   We have resolved an issue preventing Pie chart from rendering correctly
+
 ## [2.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/package.json b/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
index b0960a55d..6a660df24 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pie-doughnut-chart-native",
   "widgetName": "PieDoughnutChart",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx b/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
index 1cb70bc83..c563f7434 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
@@ -28,7 +28,7 @@ export interface Slice<X extends string, Y extends number> {
 
 export function PieDoughnutChart({ name, presentation, series, style, showLabels }: ChartProps): ReactElement | null {
     // due to the nature of the chart type, we only reply on the width, as the chart is always a square
-    const [chartDimensions, setChartDimensions] = useState<{ width: number }>();
+    const [chartDimensions, setChartDimensions] = useState<{ width?: number }>();
     // Chart user-styling may be missing for certain slices. A palette is passed, any missing colours
     // fallback to a colour from the palette or the default color.
     const normalizedSliceColors: string[] = useMemo(() => {
@@ -56,7 +56,7 @@ export function PieDoughnutChart({ name, presentation, series, style, showLabels
         (event: LayoutChangeEvent) => {
             const { width } = event.nativeEvent.layout;
             setChartDimensions({
-                width: width <= 0 ? -1 : width
+                width: width <= 0 ? undefined : width
             });
         },
         [setChartDimensions]
@@ -89,7 +89,7 @@ export function PieDoughnutChart({ name, presentation, series, style, showLabels
                         }}
                         labels={({ datum }) => (showLabels ? datum.x : undefined)}
                         innerRadius={
-                            presentation === "doughnut"
+                            presentation === "doughnut" && chartDimensions.width && chartDimensions.width > 0
                                 ? style.slices?.innerRadius ?? chartDimensions.width / DEFAULT_INNER_RADIUS_RATIO
                                 : undefined
                         }
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml b/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
index dd76a537d..a0e2938d9 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="PieDoughnutChart" version="2.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="PieDoughnutChart" version="2.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="PieDoughnutChart.xml" />
         </widgetFiles>