diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000000..d743b9d8ef
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,30 @@
+name: build
+on:
+  workflow_call:
+    inputs:
+      mvn_goal:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: corretto
+          cache: 'maven'
+          server-id: sagebionetworks
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_USERPWD
+      - name: Version artifacts
+        if: ${{ inputs.mvn_goal == 'deploy' }}
+        run: chmod 777 pomSnapshotToLastGitTag.sh && ./pomSnapshotToLastGitTag.sh
+      - name: Build with Maven
+        run: echo mvn -B ${{ inputs.mvn_goal }} --file pom.xml
+        env:
+          MAVEN_USERNAME: ${{ secrets.PLATFORM_ARTIFACTORY_USER }}
+          MAVEN_USERPWD: ${{ secrets.PLATFORM_ARTIFACTORY_PWD }}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
new file mode 100644
index 0000000000..ee22dae683
--- /dev/null
+++ b/.github/workflows/main.yaml
@@ -0,0 +1,21 @@
+name: build-main
+
+on:
+  push:
+    branches: [develop, release-**]
+  pull_request:
+    branches: [develop, release-**]
+
+jobs:
+  call-build:
+    if: github.event_name == 'push' && github.ref != 'refs/heads/develop' && github.repository_owner == 'Sage-Bionetworks'
+    uses: ./.github/workflows/build.yaml
+    with:
+      mvn_goal: deploy
+    secrets: inherit
+  call-test:
+    if: github.event_name == 'pull_request'
+    uses: ./.github/workflows/build.yaml
+    with:
+      mvn_goal: package
+    secrets: inherit
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index 4763d93659..0000000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  pull_request:
-    branches: [develop, release-**]
-  push:
-    branches: [develop]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build SWC
-        uses: ./.github/workflows/build