diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index da6161d0d12..b0d023d6c1e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         platform:
           - ubuntu-22.04
-          - [self-hosted, ARM64, macOS]
+          - [self-hosted, ARM64]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Prepare
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a2f0eae1885..3fcbb21cfd8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -42,7 +42,7 @@ jobs:
       matrix:
         platform:
           - ubuntu-22.04
-          - [self-hosted, ARM64, macOS]
+          - [self-hosted, ARM64]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Prepare
@@ -71,7 +71,7 @@ jobs:
       - name: build image
         uses: gradle/gradle-build-action@v2.10.0
         with:
-          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ env.nightly-tag }}
+          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Pbranch=${{ github.ref_name }}
       - name: install goss
         run: |
           mkdir -p docker/reports
@@ -81,7 +81,7 @@ jobs:
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
         with:
-          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ env.nightly-tag }}
+          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Pbranch=${{ github.ref_name }}
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
@@ -91,7 +91,7 @@ jobs:
       - name: publish
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
-        run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ github.repository }} -Prelease.releaseVersion=${{ env.nightly-tag }}
+        run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ github.repository }} -Pbranch=${{ github.ref_name }}
   multiArch:
     needs: buildDocker
     runs-on: ubuntu-22.04
@@ -112,5 +112,5 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: multi-arch docker
-        run: ./gradlew manifestDocker -PdockerOrgName=${{ github.repository }} -Prelease.releaseVersion=${{ env.nightly-tag }}
+        run: ./gradlew manifestDocker -PdockerOrgName=${{ github.repository }} -Pbranch=${{ github.ref_name }}