diff --git a/.github/workflows/casper-node-nightly.yml b/.github/workflows/casper-node-nightly.yml
deleted file mode 100644
index 7d010602c8..0000000000
--- a/.github/workflows/casper-node-nightly.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-name: lints
-# runs steps that are require nightly rust based on ./smart_contracts/rust-toolchain.toml
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-      - dev
-      - trying
-      - staging
-      - 'release-**'
-      - 'feat-**'
-    paths-ignore:
-      - '**.md'
-
-  pull_request:
-    branches:
-      - dev
-      - 'release-**'
-      - 'feat-**'
-    paths-ignore:
-      - '**.md'
-
-jobs:
-  lints:
-    name: lints
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: setup-nightly-rs
-        run: make setup-nightly-rs
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: check-format
-        run: make check-format
-
-      - name: doc
-        run: make doc
-
-      - name: lint
-        run: make lint
diff --git a/.github/workflows/casper-node.yml b/.github/workflows/casper-node.yml
index fb8b5d5f95..77822a2933 100644
--- a/.github/workflows/casper-node.yml
+++ b/.github/workflows/casper-node.yml
@@ -33,11 +33,20 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: setup-wo-nightly
-        run: make setup-wo-nightly
+      - name: setup
+        run: make setup
 
       - uses: Swatinem/rust-cache@v2
 
+      - name: check-format
+        run: make check-format
+
+      - name: doc
+        run: make doc
+
+      - name: lint
+        run: make lint
+
       - name: audit
         run: make audit
 
diff --git a/Cargo.lock b/Cargo.lock
index b8b53c15c6..f1c9635722 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -592,9 +592,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
 dependencies = [
  "serde",
 ]
diff --git a/Makefile b/Makefile
index df1e8c028d..a6b27bbed6 100644
--- a/Makefile
+++ b/Makefile
@@ -173,23 +173,16 @@ bench: build-contracts-rs
 setup-cargo-packagers:
 	$(CARGO) install cargo-deb || exit 0
 
-.PHONY: setup
-setup: setup-rs
-
 .PHONY: setup-rs
-setup-rs: setup-wo-nightly setup-nightly-rs
-
-.PHONY: setup-wo-nightly
-setup-wo-nightly:
+setup-rs:
 	$(RUSTUP) update
-	$(RUSTUP) toolchain install $(PINNED_STABLE)
+	$(RUSTUP) toolchain install $(PINNED_STABLE) $(PINNED_NIGHTLY)
 	$(RUSTUP) target add --toolchain $(PINNED_STABLE) wasm32-unknown-unknown
-	$(RUSTUP) component add clippy-preview
-	$(CARGO) install cargo-audit
-
-.PHONY: setup-nightly-rs
-setup-nightly-rs:
-	$(RUSTUP) update
-	$(RUSTUP) toolchain install $(PINNED_NIGHTLY)
 	$(RUSTUP) target add --toolchain $(PINNED_NIGHTLY) wasm32-unknown-unknown
 	$(RUSTUP) component add --toolchain $(PINNED_NIGHTLY) rustfmt clippy-preview
+	$(RUSTUP) component add --toolchain $(PINNED_STABLE) clippy-preview
+	$(CARGO) install cargo-audit
+
+.PHONY: setup
+setup: setup-rs
+