diff --git a/.github/workflows/build-scala-cli-template.yml b/.github/workflows/build-scala-cli-template.yml
index 22409c02856..f40788b2700 100644
--- a/.github/workflows/build-scala-cli-template.yml
+++ b/.github/workflows/build-scala-cli-template.yml
@@ -34,9 +34,9 @@ jobs:
       - name: Cache Scala-CLI
         uses: coursier/cache-action@v6
       - name: Setup Scala-CLI
-        uses: VirtusLab/scala-cli-setup@v0.2.1
+        uses: VirtusLab/scala-cli-setup@v1
         with:
-          jvm: adoptium:1.17
+          jvm: adoptium:17
           apps: sbt
       - name: Generate Scala CLI Template
         shell: bash
diff --git a/.github/workflows/build-scala-cli-template/chisel-template.scala b/.github/workflows/build-scala-cli-template/chisel-template.scala
index 4c19081f297..8ae362d0f06 100644
--- a/.github/workflows/build-scala-cli-template/chisel-template.scala
+++ b/.github/workflows/build-scala-cli-template/chisel-template.scala
@@ -1,11 +1,12 @@
 //> using repository "sonatype-s01:snapshots"
 //> using scala "2.13.12"
-//> using lib "org.chipsalliance::chisel::@VERSION@"
+//> using dep "org.chipsalliance::chisel::@VERSION@"
 //> using plugin "org.chipsalliance:::chisel-plugin::@VERSION@"
 //> using options "-unchecked", "-deprecation", "-language:reflectiveCalls", "-feature", "-Xcheckinit", "-Xfatal-warnings", "-Ywarn-dead-code", "-Ywarn-unused", "-Ymacro-annotations"
 
 import chisel3._
-import circt.stage.ChiselStage
+// _root_ disambiguates from package chisel3.util.circt if user imports chisel3.util._
+import _root_.circt.stage.ChiselStage
 
 class Foo extends Module {
   val a, b, c = IO(Input(Bool()))