diff --git a/.circleci/config.yml b/.circleci/config.yml
index 204b60aa1..06ef9f59c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,26 +109,6 @@ jobs:
       - store_artifacts:
           path: /tmp/logs
 
-  localnet:
-    working_directory: /home/circleci/.go_workspace/src/github.com/tendermint/tendermint
-    machine:
-      image: circleci/classic:latest
-    environment:
-      GOBIN: /home/circleci/.go_workspace/bin
-      GOPATH: /home/circleci/.go_workspace/
-      GOOS: linux
-      GOARCH: amd64
-    parallelism: 1
-    steps:
-      - checkout
-      - run:
-          name: run localnet and exit on failure
-          command: |
-            set -x
-            docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux
-            make localnet-start &
-            ./scripts/localnet-blocks-test.sh 40 5 10 localhost
-
   test_p2p:
     environment:
       GOBIN: /home/circleci/.go_workspace/bin
@@ -376,9 +356,6 @@ workflows:
       - test_persistence:
           requires:
             - setup_dependencies
-      - localnet:
-          requires:
-            - setup_dependencies
       - test_p2p
       - test_p2p:
           name: test_p2p_ipv6
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index cf983f4cc..5367aec77 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,4 +1,7 @@
 name: Lint
+# Lint runs golangci-lint over the entire Tendermint repository
+# This workflow is run on every pull request and push to master
+# The `golangci` job will pass without running if no *.{go, mod, sum} files have been modified.
 on:
   pull_request:
   push:
diff --git a/.github/workflows/net.yml b/.github/workflows/net.yml
new file mode 100644
index 000000000..f98c88f16
--- /dev/null
+++ b/.github/workflows/net.yml
@@ -0,0 +1,26 @@
+name: Net
+# Net creates a 4 node test network with docker-compose
+# This workflow is run on every pull request, if a *{.go, .mod, .sum} file has been modified, and push to master and release/** branches
+on:
+  pull_request:
+    paths:
+      - "**.go"
+      - "**.mod"
+      - "**.sum"
+  push:
+    branches:
+      - master
+      - release/**
+
+jobs:
+  net-short:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: 10 Blocks
+        run: |
+          set -x
+          docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux
+          make localnet-start &
+          ./scripts/localnet-blocks-test.sh 40 5 10 localhost
+# Decide if we want to run longer lived testnets
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
index f971de7f7..a21210352 100644
--- a/.github/workflows/proto.yml
+++ b/.github/workflows/proto.yml
@@ -1,4 +1,6 @@
-name: Proto check
+name: Protobuf
+# Protobuf runs buf (https://buf.build/) lint and check-breakage
+# This workflow is only run when a .proto file has been modified
 on:
   pull_request:
     paths:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index acec25a39..9dea1b9b6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,7 @@
 name: Tests
+# Tests runs different tests (test_abci_apps, test_abci_cli, test_apps)
+# This workflow runs on every push to master or release branch and  every pull requests
+# All jobs will pass without running if no *{.go, .mod, .sum} files have been modified
 on:
   pull_request:
   push: