diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89783672..0b7477d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,32 +10,33 @@ jobs:
   build-binary:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          path: ./src/github.com/${{ github.repository }}
-
       - name: Install Go
         uses: actions/setup-go@v1
         with:
           go-version: '1.14.x'
-      - run: |
-          go mod download
-          go mod verify
 
       - name: Install Node
         uses: actions/setup-node@v1
         with:
           node-version: '10.x'
-      - run: |
-          npm install -g yarn sass newman cross-env wait-on @sentry/cli
-          cd frontend && yarn && yarn build
 
-      - name: Build Statping
+      - name: Install Dependencies
+        run: npm install -g yarn sass newman cross-env wait-on @sentry/cli
+
+      - name: Checkout Statping
+        uses: actions/checkout@v2
+
+      - name: Download Frontend Dependencies
+        working-directory: ./frontend
+        run: yarn
+
+      - name: Download Go mods
         run: |
           go mod download
           go mod verify
-          make clean compile
+
+      - name: Build Frontend Statping
+        run: make clean compile
 
       - name: Install Statping
         run: make install
@@ -44,3 +45,6 @@ jobs:
         env:
           DB_CONN: sqlite3
         run: SASS=`which sass` go test -v -covermode=count -coverprofile=coverage.out -p=1 ./...
+
+      - name: Build Binaries
+        run: make build-bin build-win