diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7acc25182..6e65eff6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ executors:
       AWS_REGION: us-east-1
   protoc:
     docker:
-      - image: tendermintdev/docker-protoc
+      - image: bufbuild/buf
 
 commands:
   make:
@@ -79,9 +79,6 @@ jobs:
   proto:
     executor: protoc
     steps:
-      - make:
-          target: protoc-gen-gocosmos
-          description: "Generate go plugin for protoc"
       - make:
           target: proto-gen proto-lint proto-check-breaking
           description: "Lint and verify Protocol Buffer definitions"
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
index 73f3de53a..d0b4b0fe7 100644
--- a/.github/workflows/sims.yml
+++ b/.github/workflows/sims.yml
@@ -1,6 +1,14 @@
 name: Sims
 on: [pull_request]
 jobs:
+  cleanup-runs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: rokroskar/workflow-run-cleanup-action@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+
   build:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip-sims')"