diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7e1baaad6..551644d76 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -11,19 +11,24 @@ jobs:
     name: Linux
     runs-on: ubuntu-latest
 
+    defaults:
+      run:
+        working-directory: src/github.com/containerd/containerd
+
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
+      - uses: actions/setup-go@v1
         with:
           go-version: '1.15.2'
 
-      - name: Checkout
-        uses: actions/checkout@v1
-        env:
-          GOPATH: ${{ runner.workspace }}
-          GO111MODULE: off
+      - uses: actions/checkout@v2
         with:
-          path: ./src/github.com/containerd/containerd
+          path: src/github.com/containerd/containerd
+
+      - name: Set env
+        shell: bash
+        run: |
+          echo "::set-env name=GOPATH::${{ github.workspace }}"
+          echo "::add-path::${{ github.workspace }}/bin"
 
       #
       # Build
@@ -51,7 +56,6 @@ jobs:
 
       - name: Build amd64
         env:
-          GOPATH: ${{ runner.workspace }}
           GOOS: linux
           GOARCH: amd64
         run: |
@@ -60,7 +64,6 @@ jobs:
 
       - name: Build arm64
         env:
-          GOPATH: ${{ runner.workspace }}
           GOOS: linux
           GOARCH: arm64
           CC: aarch64-linux-gnu-gcc
@@ -71,7 +74,6 @@ jobs:
 
       - name: Build s390x
         env:
-          GOPATH: ${{ runner.workspace }}
           GOOS: linux
           GOARCH: s390x
           CGO_ENABLED: 1
@@ -82,7 +84,6 @@ jobs:
 
       - name: Build ppc64le
         env:
-          GOPATH: ${{ runner.workspace }}
           GOOS: linux
           GOARCH: ppc64le
           CGO_ENABLED: 1
@@ -99,46 +100,51 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: linux_amd64
-          path: bin_amd64
+          path: src/github.com/containerd/containerd/bin_amd64
 
       - name: Upload artifacts (linux_arm64)
         uses: actions/upload-artifact@v1
         with:
           name: linux_arm64
-          path: bin_arm64
+          path: src/github.com/containerd/containerd/bin_arm64
 
       - name: Upload artifacts (linux_s390x)
         uses: actions/upload-artifact@v1
         with:
           name: linux_s390x
-          path: bin_s390x
+          path: src/github.com/containerd/containerd/bin_s390x
 
       - name: Upload artifacts (linux_ppc64le)
         uses: actions/upload-artifact@v1
         with:
           name: linux_ppc64le
-          path: bin_ppc64le
+          path: src/github.com/containerd/containerd/bin_ppc64le
 
   windows:
     name: Windows
     runs-on: windows-latest
+
+    defaults:
+      run:
+        working-directory: src/github.com/containerd/containerd
+
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
+      - uses: actions/setup-go@v1
         with:
           go-version: '1.15.2'
 
-      - name: Checkout
-        uses: actions/checkout@v1
-        env:
-          GOPATH: ${{ runner.workspace }}
-          GO111MODULE: off
+      - uses: actions/checkout@v2
         with:
-          path: ./src/github.com/containerd/containerd
+          path: src/github.com/containerd/containerd
+
+      - name: Set env
+        shell: bash
+        run: |
+          echo "::set-env name=GOPATH::${{ github.workspace }}"
+          echo "::add-path::${{ github.workspace }}/bin"
 
       - name: Build amd64
         env:
-          GOPATH: ${{ runner.workspace }}
           GOOS: windows
           GOARCH: amd64
         run: |
@@ -148,4 +154,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: windows_amd64
-          path: bin
+          path: src/github.com/containerd/containerd/bin/