diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml
index f8161ae76..92467e650 100644
--- a/.github/workflows/build-multiarch.yaml
+++ b/.github/workflows/build-multiarch.yaml
@@ -1,18 +1,19 @@
-name: BuildMultiArch
+name: BuildContainerImage
 
 on:
   push:
     branches:
       - 'master'
-      - 'release*'
+      - 'release-*'
     tags:
       - 'v*'
   pull_request:
     branches:
       - 'master'
-      - 'release*'
+      - 'release-*'
 
 jobs:
+  if: github.event_name == 'push'
   build:
     name: Build
     runs-on: ubuntu-latest
@@ -36,7 +37,6 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        if: github.event_name == 'push'
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG="${GITHUB_REF#refs/*/}-multiarch" make container-cross-push
+          REPO=kubespheredev TAG="${GITHUB_REF#refs/*/}" make container-cross-push
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index a9eac5d10..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'release*'
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - 'master'
-      - 'release*'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-    steps:
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.16
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Check pr is properly formatted
-        run: diff -u <(echo -n) <(gofmt -d ./pkg ./cmd ./tools ./test)
-
-      - name: Verify goimports
-        run: go get -u golang.org/x/tools/cmd/goimports && bash hack/verify-goimports.sh
-
-      - name: Downloading go dependencies
-        run: go mod vendor
-
-      - name: Build
-        run: make all
-
-      - name: Make OpenAPI Spec
-        run: make openapi
-
-      - name: Uploading code coverage
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.txt
-          flags: unittests
-          name: codecov-umbrella
-          fail_ci_if_error: false
-
-      - name: Build and push docker images
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        if: github.event_name == 'push'
-        run: |
-          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG=${GITHUB_REF#refs/*/} make container-push
diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml
index cab66de1f..0ab9e353c 100644
--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -26,28 +26,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Downloading go dependencies
-        run: go mod vendor
-
-      - name: Build
-        run: make all
-
-      - name: Make OpenAPI Spec
-        run: make openapi
-
       - name: Build and push docker images
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-
-          if [[ $? == 0 ]]; then
-            tag=nightly-$(date '+%Y%m%d')
-            REPO=kubespheredev TAG=${tag} make container-push
-          else
-            exit -1
-          fi
+          tag=nightly-$(date '+%Y%m%d')
+          REPO=kubespheredev TAG=${tag} make container-push
 
       - name: slack
         uses: 8398a7/action-slack@v3