diff --git a/.github/scripts/mxbuild.Dockerfile b/.github/scripts/mxbuild.Dockerfile
index e5488b7ba..ecf91ed3a 100644
--- a/.github/scripts/mxbuild.Dockerfile
+++ b/.github/scripts/mxbuild.Dockerfile
@@ -12,13 +12,8 @@ RUN \
     rm /tmp/openjdk.tar.gz 
 
 RUN \
-    if [ -n "$MENDIX_VERSION_URL" ]; then \
-      echo "Downloading mxbuild from provided URL..." && \
-      wget -q $MENDIX_VERSION_URL -O /tmp/mxbuild.tar.gz; \
-    else \
-      echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
-      wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz; \
-    fi && \
+    echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
+    wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz && \
     mkdir /tmp/mxbuild && \
     tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
     rm /tmp/mxbuild.tar.gz 
diff --git a/.github/workflows/NativePipeline.yml b/.github/workflows/NativePipeline.yml
index e35bf87b6..167f7d84d 100644
--- a/.github/workflows/NativePipeline.yml
+++ b/.github/workflows/NativePipeline.yml
@@ -2,8 +2,8 @@ name: Run Native Pipeline
 on:
   workflow_dispatch:
     inputs:
-      mendix_version_url:
-        description: "Provide the url of SP to be used in job (Full path to mxbuild.tar.gz)"
+      mendix_version:
+        description: "Provide the SP version to be used (e.g., 10.14.0.43709). If empty, latest version will be used."
         required: false
         default: ""
 
@@ -81,7 +81,7 @@ jobs:
             if [ "${{ github.event_name }}" == "pull_request" ]; then
               echo "scope=--since --include '*-native'" >> $GITHUB_OUTPUT
             else
-              echo "scope=--include '*-native' --all" >> $GITHUB_OUTPUT
+              echo "scope=--all--include '*-native'" >> $GITHUB_OUTPUT
             fi
           fi
 
@@ -93,33 +93,26 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       mendix_version: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION }}
-      mendix_version_url: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION_URL }}
     steps:
       - name: "Check out code"
         uses: actions/checkout@v3
       - name: "Get Mendix version from JSON"
         id: get-mendix-version
-        if: ${{ github.event.inputs.mendix_version_url == '' }}
         uses: notiz-dev/github-action-json-property@v0.2.0
         with:
           path: configs/e2e/mendix-versions.json
           prop_path: latest
-      - name: Set Mendix version and URL
+      - name: Set Mendix version
         id: set-mendix-version
         run: |
-          if [[ -n "${{ github.event.inputs.mendix_version_url }}" ]]; then
-            MENDIX_VERSION=$(basename ${{ github.event.inputs.mendix_version_url }} | sed 's/mxbuild-\(.*\)\.tar\.gz/\1/')
-            echo "MENDIX_VERSION=${MENDIX_VERSION}" >> $GITHUB_OUTPUT
-            echo "MENDIX_VERSION_URL=${{ github.event.inputs.mendix_version_url }}" >> $GITHUB_OUTPUT
+          if [[ -n "${{ github.event.inputs.mendix_version }}" ]]; then
+            echo "MENDIX_VERSION=${{ github.event.inputs.mendix_version }}" >> $GITHUB_OUTPUT
           else
-            MENDIX_VERSION="${{ steps.get-mendix-version.outputs.prop }}"
-            echo "MENDIX_VERSION=${MENDIX_VERSION}" >> $GITHUB_OUTPUT
-            echo "MENDIX_VERSION_URL=https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz" >> $GITHUB_OUTPUT
+            echo "MENDIX_VERSION=${{ steps.get-mendix-version.outputs.prop }}" >> $GITHUB_OUTPUT
           fi
       - name: "Debug Mendix Version"
         run: |
           echo "Mendix Version: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION }}"
-          echo "Mendix Version URL: ${{ steps.set-mendix-version.outputs.MENDIX_VERSION_URL }}"
 
   docker-images:
     needs: mendix-version
@@ -146,7 +139,6 @@ jobs:
           context: ./.github/scripts
           build-args: |
             MENDIX_VERSION=${{ needs.mendix-version.outputs.mendix_version }}
-            MENDIX_VERSION_URL=${{ needs.mendix-version.outputs.mendix_version_url }}
           push: true
           tags: ghcr.io/mendix/native-widgets/mxbuild:${{ needs.mendix-version.outputs.mendix_version }}
   resources: