diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 14b99d6ab..409802d69 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -119,18 +119,31 @@ jobs:
       - name: Check for Misspelled Words in Doc Files
         run: make misspell
 
-# Below checks don't need to run `make install-tools`
   lint:
     runs-on: ubuntu-20.04
+    needs:
+      - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-      - name: Run Revive Action by pulling pre-built image
-        uses: docker://morphy/revive-action:v2
+      - name: Setup Go
+        uses: actions/setup-go@v5
         with:
-          config: revive/config.toml
-
+          go-version: "1.21"
+          check-latest: true
+      - name: Cache Tools
+        id: tool-cache
+        uses: actions/cache@v3
+        with:
+          path: /home/runner/go/bin
+          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
+      - name: Run Revive Linter
+        run: make lint
 
+# Below checks don't need to run `make install-tools`
   check-plugin-docs:
     runs-on: "ubuntu-20.04"
     steps:
diff --git a/go.mod b/go.mod
index c78ca2703..d11c62635 100644
--- a/go.mod
+++ b/go.mod
@@ -709,6 +709,8 @@ replace github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceive
 
 replace github.com/observiq/bindplane-agent/receiver/httpreceiver => ./receiver/httpreceiver
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => github.com/observiq/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.0.0-20240423161546-f6f0fff07f3b
+
 // Does not build with windows and only used in configschema executable
 // Relevant issue https://github.com/mattn/go-ieproxy/issues/45
 replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1
diff --git a/go.sum b/go.sum
index f97479a5c..4ec908063 100644
--- a/go.sum
+++ b/go.sum
@@ -1086,6 +1086,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo=
 github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc h1:49ewVBwLcy+eYqI4R0ICilCI4dPjddpFXWv3liXzUxM=
+github.com/observiq/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.0.0-20240423161546-f6f0fff07f3b h1:QvUY6yKlH6E4hgGC5LJtMohIshNYEoIwOCyupWwm7mc=
+github.com/observiq/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.0.0-20240423161546-f6f0fff07f3b/go.mod h1:4BtKN8L1vy4vl7mgOmSSDDZXT9p7pzJHr800yKYC/Zw=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -1363,8 +1365,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpu
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.92.0/go.mod h1:cEG0bpFApgT2X5vuEWEHQ4x0TIpMaPOo+0dQ+u5OBGA=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.92.0 h1:Sv067Zq+Oh5rSDV4Sreg+/0b3A+3vZtD3CsSi6+q1d8=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.92.0/go.mod h1:CcoKb8ZrH4WCUQBf1zoE1q6o/fYjrrFGK9RH0sd0cvY=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.92.0 h1:d9beTTdIXcCj5wHuCpr3R19C9wRggz5jNfuECtr+m2Y=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.92.0/go.mod h1:4BtKN8L1vy4vl7mgOmSSDDZXT9p7pzJHr800yKYC/Zw=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.92.0 h1:64WoianhRQxLr68TYxl+Vaf6Da9KDTSgbw7Mnc2AyYI=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.92.0/go.mod h1:Ep5pZrLs3ACQOXPlUHMC4oyUxwp2uXLLGMxCyzSea1Y=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.92.0 h1:ZHFNRM7JXhTlGO0Bq25AAO8kdb/B3CXzIj3+k1HN69I=