diff --git a/.github/workflows/tiiuae-pixhawk.yaml b/.github/workflows/tiiuae-pixhawk.yaml
index 1c50cae9bf47..69a9b7a7fa68 100644
--- a/.github/workflows/tiiuae-pixhawk.yaml
+++ b/.github/workflows/tiiuae-pixhawk.yaml
@@ -45,40 +45,57 @@ jobs:
           echo "$GITHUB_WORKSPACE/.jfrog/bin" >> "$GITHUB_PATH"
           echo "JFROG_CLI_HOME_DIR=$GITHUB_WORKSPACE/.jfrog" >> "$GITHUB_ENV"
 
-      - name: Upload to Artifactory
+      - name: Import Artifactory token
         env:
           ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
-          ARTIFACTORY_GEN_REPO: gen-public-local
-          ARTIFACTORY_DEB_REPO: debian-public-local
-          DISTRIBUTION: focal
-          COMPONENT: fog-sw
-          ARCHITECTURE: amd64
-          BUILD_NAME: px4-firmware
           CI: true
         if: github.event_name == 'push'
         run: |
           set -exu
           jfrog rt c import "$ARTIFACTORY_TOKEN"
           jfrog rt ping
+
+      - name: Upload px4-firmware build to Artifactory
+        env:
+          ARTIFACTORY_GEN_REPO: gen-public-local
+          BUILD_NAME_PX4: px4-firmware
+          CI: true
+        if: github.event_name == 'push'
+        run: |
+          set -exu
           pkg=$(find bin -name 'px4_fmu-v5_ssrc*.px4')
           pkg_name=$(basename $pkg)
           jfrog rt u --target-props COMMIT="$GITHUB_SHA" \
-                     --build-name "$BUILD_NAME" \
+                     --build-name "$BUILD_NAME_PX4" \
                      --build-number "$GITHUB_SHA" \
-                     --module px4_fmu-v5_ssrc \
                      "$pkg" \
                      "$ARTIFACTORY_GEN_REPO/builds/px4-firmware/pixhawk/$pkg_name"
+          jfrog rt build-publish "$BUILD_NAME_PX4" "$GITHUB_SHA"
+          jfrog rt bpr "$BUILD_NAME_PX4" "$GITHUB_SHA" "$ARTIFACTORY_GEN_REPO" \
+                       --status dev \
+                       --comment "development build"
           jfrog rt cp "$ARTIFACTORY_GEN_REPO/builds/px4-firmware/pixhawk/$pkg_name" \
                       "$ARTIFACTORY_GEN_REPO/px4_fmu-v5_ssrc-LATEST.px4"
+
+      - name: Upload px4-fwupdater build to Artifactory
+        env:
+          ARTIFACTORY_DEB_REPO: debian-public-local
+          DISTRIBUTION: focal
+          COMPONENT: fog-sw
+          ARCHITECTURE: amd64
+          BUILD_NAME_DEB: px4-fwupdater
+          CI: true
+        if: github.event_name == 'push'
+        run: |
+          set -exu
           pkg=$(find bin -name 'px4fwupdater*.deb')
           jfrog rt u --deb "$DISTRIBUTION/$COMPONENT/$ARCHITECTURE" \
                      --target-props COMMIT="$GITHUB_SHA" \
-                     --build-name "$BUILD_NAME" \
+                     --build-name "$BUILD_NAME_DEB" \
                      --build-number "$GITHUB_SHA" \
-                     --module px4fwupdater \
                      "$pkg" \
                      "$ARTIFACTORY_DEB_REPO"
-          jfrog rt build-publish "$BUILD_NAME" "$GITHUB_SHA"
-          jfrog rt bpr "$BUILD_NAME" "$GITHUB_SHA" "$ARTIFACTORY_REPO" \
+          jfrog rt build-publish "$BUILD_NAME_DEB" "$GITHUB_SHA"
+          jfrog rt bpr "$BUILD_NAME_DEB" "$GITHUB_SHA" "$ARTIFACTORY_DEB_REPO" \
                        --status dev \
                        --comment "development build"
diff --git a/.github/workflows/tiiuae-sitl.yaml b/.github/workflows/tiiuae-sitl.yaml
index 630966471e35..b6d9a45fcf23 100644
--- a/.github/workflows/tiiuae-sitl.yaml
+++ b/.github/workflows/tiiuae-sitl.yaml
@@ -64,7 +64,7 @@ jobs:
                      "$pkg" \
                      "$ARTIFACTORY_GEN_REPO/builds/px4-firmware/sitl/$pkg_name"
           jfrog rt build-publish "$BUILD_NAME" "$GITHUB_SHA"
-          jfrog rt bpr "$BUILD_NAME" "$GITHUB_SHA" "$ARTIFACTORY_REPO" \
+          jfrog rt bpr "$BUILD_NAME" "$GITHUB_SHA" "$ARTIFACTORY_GEN_REPO" \
                        --status dev \
                        --comment "development build"
           jfrog rt cp "$ARTIFACTORY_GEN_REPO/builds/px4-firmware/sitl/$pkg_name" \