diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml
deleted file mode 100644
index 1474eb442..000000000
--- a/.github/workflows/build_base.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build PlatformIO Base
-
-on:
-  workflow_call:
-    outputs:
-      version:
-        description: "Release version string"
-        value: ${{ jobs.build-base.outputs.version }}
-
-jobs: 
-  build-base:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.x
-
-      - name: Cache python libs
-        uses: actions/cache@v3
-        id: cache-pip # needed in if test
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-
-      - name: Upgrade python tools
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio adafruit-nrfutil
-
-      - name: Upgrade platformio
-        run: |
-          pio upgrade
-
-      - name: Get release version string
-        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
\ No newline at end of file
diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml
index 50ceb74ed..8a109d2d1 100644
--- a/.github/workflows/build_esp32.yml
+++ b/.github/workflows/build_esp32.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Build base
         id: base
-        uses: ./.github/workflows/build_base.yml
+        uses: ./.github/workflows/composite/build-base
 
       - name: Pull web ui
         uses: dsaltares/fetch-gh-release-asset@master
diff --git a/.github/workflows/composite/build_base.yml b/.github/workflows/composite/build_base.yml
new file mode 100644
index 000000000..4bd0cc89a
--- /dev/null
+++ b/.github/workflows/composite/build_base.yml
@@ -0,0 +1,42 @@
+name: 'Build Base Composite Action'
+description: 'Base build action for Meshtastic Platform IO steps'
+
+outputs:
+  version:
+    description: "Release version string"
+    value: ${{ steps.outputs.version }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        submodules: "recursive"
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v3
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
+
+    - name: Upgrade python tools
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio adafruit-nrfutil
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    - name: Get release version string
+      run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+      id: version
\ No newline at end of file