diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml
index b142b5bba0..9b8af9c53b 100644
--- a/.github/workflows/static-checks.yaml
+++ b/.github/workflows/static-checks.yaml
@@ -8,64 +8,59 @@ jobs:
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     env:
-      GO111MODULE: off
       TRAVIS: "true"
       TRAVIS_BRANCH: ${{ github.base_ref }}
       TRAVIS_PULL_REQUEST_BRANCH: ${{ github.head_ref }}
       TRAVIS_PULL_REQUEST_SHA : ${{ github.event.pull_request.head.sha }}
       RUST_BACKTRACE: "1"
-      RUST_AGENT: "yes"
+      target_branch: ${TRAVIS_BRANCH}
     steps:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
         go-version: ${{ matrix.go-version }}
+      env:
+        GOPATH: ${{ runner.workspace }}/kata-containers
     - name: Setup GOPATH
       run: |
-        gopath_org=$(go env GOPATH)/src/github.com/kata-containers/
-        mkdir -p ${gopath_org}
-        ln -s ${PWD} ${gopath_org}
         echo "TRAVIS_BRANCH: ${TRAVIS_BRANCH}"
         echo "TRAVIS_PULL_REQUEST_BRANCH: ${TRAVIS_PULL_REQUEST_BRANCH}"
         echo "TRAVIS_PULL_REQUEST_SHA: ${TRAVIS_PULL_REQUEST_SHA}"
         echo "TRAVIS: ${TRAVIS}"
+    - name: Set env
+      run: |
+        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
+        echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
     - name: Checkout code
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+        path: ./src/github.com/${{ github.repository }}
     - name: Setup travis references
       run: |
-        echo "TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = \"/\" } ; { print $3 }')}" 
+        echo "TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = \"/\" } ; { print $3 }')}"
+        target_branch=${TRAVIS_BRANCH}
     - name: Setup
       run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/ci/
-        GOPATH=$(go env GOPATH) ./setup.sh
-    - name: Install rust
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && ./ci/setup.sh
+      env:
+        GOPATH: ${{ runner.workspace }}/kata-containers
+    - name: Building rust
       run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/ci/
-        GOPATH=$(go env GOPATH) ./install_rust.sh
-    - name: Agent
-      run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/src/agent
-        GOPATH=$(go env GOPATH) make    
-    - name: Install agent
-      run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/src/agent
-        GOPATH=$(go env GOPATH) make check 
-    - name: Make clippy
-      run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/src/agent
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && ./ci/install_rust.sh
+        PATH=$PATH:"$HOME/.cargo/bin"
         rustup target add x86_64-unknown-linux-musl
-        rustup component add rustfmt
-        rustup component add clippy
-        GOPATH=$(go env GOPATH) make clippy
-    - name: Static checks
+        rustup component add rustfmt clippy
+    # Must build before static checks as we depend on some generated code in runtime and agent
+    - name: Build
       run: |
-        kata_repo=$(go env GOPATH)/src/github.com/kata-containers/kata-containers
-        pushd ${kata_repo}/ci/
-        GOPATH=$(go env GOPATH) ./static-checks.sh
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && make
+    - name: Static Checks
+      run: |
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && ./ci/static-checks.sh
+    - name: Run Compiler Checks
+      run: |
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && make check
+    - name: Run Unit Tests
+      run: |
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && make test
diff --git a/src/agent/Makefile b/src/agent/Makefile
index 704e71927f..582804053c 100644
--- a/src/agent/Makefile
+++ b/src/agent/Makefile
@@ -140,6 +140,10 @@ clippy: $(GENERATED_CODE)
 		-Aclippy::redundant_allocation \
 		-D warnings
 
+format:
+	cargo fmt -- --check
+
+
 ##TARGET install: install agent
 install: install-services
 	@install -D $(TARGET_PATH) $(DESTDIR)/$(BINDIR)/$(TARGET)
@@ -155,7 +159,7 @@ test:
 	@cargo test --all --target $(TRIPLE)
 
 ##TARGET check: run test
-check: test
+check: clippy format
 
 ##TARGET run: build and run agent
 run:
diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index 742cf3a401..57fcfba501 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -638,7 +638,6 @@ go-test: $(GENERATED_FILES)
 	go test -v -mod=vendor ./...
 
 check-go-static:
-	$(QUIET_CHECK)../../ci/static-checks.sh
 	$(QUIET_CHECK)../../ci/go-no-os-exit.sh ./cli
 	$(QUIET_CHECK)../../ci/go-no-os-exit.sh ./virtcontainers