diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b8a0927..deb3130 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,6 +14,7 @@ jobs:
       SECRET: ${{ secrets.SECRET }}
       CONFIGURATION: "this"
       GITHUB_OCELOT_REF_JUST_BUILT: ${{ github.event.client_payload.ref }}
+      OCELOT_GITHUB_RUN_NUMBER: ${{ github.event.client_payload.GITHUB_RUN_NUMBER }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -76,6 +77,7 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       GITHUB_OCELOT_REF_JUST_BUILT: ${{ github.event.client_payload.ref }}
+      OCELOT_GITHUB_RUN_NUMBER: ${{ github.event.client_payload.GITHUB_RUN_NUMBER }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -133,6 +135,7 @@ jobs:
     env:
       SECRET: ${{ secrets.SECRET }}
       GITHUB_OCELOT_REF_JUST_BUILT: ${{ github.event.client_payload.ref }}
+      OCELOT_GITHUB_RUN_NUMBER: ${{ github.event.client_payload.GITHUB_RUN_NUMBER }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -154,14 +157,20 @@ jobs:
           repository: 'Ocelot-Social-Community/Ocelot-Social'
           ref: ${{ env.GITHUB_OCELOT_REF }}
           path: 'ocelot/'
-          fetch-depth: 0 
+          fetch-depth: 0
+      - name: Set OCELOT_GITHUB_RUN_NUMBER
+        run: |
+          if [ -z ${OCELOT_GITHUB_RUN_NUMBER} ]; then
+            echo "OCELOT_GITHUB_RUN_NUMBER=master" >> $GITHUB_ENV
+          fi
+        shell: bash
       - name: Setup env
         run: |
           echo "OCELOT_VERSION=$(node -p -e "require('./ocelot/package.json').version")" >> $GITHUB_ENV
           echo "BRANDED_VERSION=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
           echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
           echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
-      - run: echo "BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}" >> $GITHUB_ENV
+      - run: echo "BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}-${OCELOT_GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: package-version-to-git-tag + build number
         uses: pkgdeps/git-tag-action@v2
         with:
@@ -216,14 +225,20 @@ jobs:
           repository: 'Ocelot-Social-Community/Ocelot-Social'
           ref: ${{ env.GITHUB_OCELOT_REF }}
           path: 'ocelot/'
-          fetch-depth: 0 
+          fetch-depth: 0
+      - name: Set OCELOT_GITHUB_RUN_NUMBER
+        run: |
+          if [ -z ${OCELOT_GITHUB_RUN_NUMBER} ]; then
+            echo "OCELOT_GITHUB_RUN_NUMBER=master" >> $GITHUB_ENV
+          fi
+        shell: bash
       - name: Setup env
         run: |
           echo "OCELOT_VERSION=$(node -p -e "require('./ocelot/package.json').version")" >> $GITHUB_ENV
           echo "BRANDED_VERSION=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
           echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
           echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
-      - run: echo "BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}" >> $GITHUB_ENV
+      - run: echo "BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}-${OCELOT_GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
         with: