diff --git a/.renovaterc.json5 b/.renovaterc.json5
index 51ae2ea..6f677ff 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -18,6 +18,14 @@
       "matchPackageNames": ["edu.berkeley.cs:chiseltest"],
       "allowedVersions": "~0.6", // Chisel 3.6 (chipyard chisel)
     },
+    {
+      // Pull rocket-chip from Sonatype OSS snapshot repos
+      "matchPackageNames": ["edu.berkeley.cs:rocketchip-3.6.0"],
+      "registryUrls": [
+        "https://oss.sonatype.org/content/repositories/snapshots",
+        "https://s01.oss.sonatype.org/content/repositories/snapshots",
+      ],
+    },
   ],
   "regexManagers": [
     {
diff --git a/build.sbt b/build.sbt
index a363d2d..fefef52 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,40 +1,3 @@
-// ThisBuild / organization := "edu.berkeley.cs"
-// ThisBuild / version := "0.0.1-SNAPSHOT"
-
-// ThisBuild / scalaVersion := "2.13.10"
-// ThisBuild / scalacOptions := Seq(
-//   "-deprecation",
-//   "-feature",
-//   "-language:reflectiveCalls",
-//   "-Xcheckinit",
-//   "-Xlint",
-// )
-
-// Compile / doc / scalacOptions += "-groups"
-
-// val chiselVersion = "3.6.0"
-
-// lazy val root = (project in file("."))
-//   .settings(
-//     name := "uciedigital",
-//     libraryDependencies ++= Seq(
-//       "edu.berkeley.cs" %% "chisel3" % chiselVersion,
-//       "edu.berkeley.cs" %% "chiseltest" % "0.6.2" % Test,
-//       "org.scalatest" %% "scalatest" % "3.2.17" % Test,
-//       "edu.berkeley.cs" %% "rocketchip" % "1.6.0",
-//       "edu.berkeley.cs" %% "rocket-macros" % "1.6.0",
-//       "edu.berkeley.cs" %% "cde" % "1.6.0",
-//     ),
-//     addCompilerPlugin(
-//       "edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full,
-//     ),
-//   )
-
-// // Plugins
-// Global / excludeLintKeys += idePackagePrefix
-// root / idePackagePrefix := Some("edu.berkeley.cs.ucie.digital")
-
-name := "ucie_digital"
 ThisBuild / organization := "edu.berkeley.cs"
 ThisBuild / version := "0.0.1-SNAPSHOT"
 
@@ -51,28 +14,32 @@ Compile / doc / scalacOptions += "-groups"
 
 val chiselVersion = "3.6.0"
 
-// SNAPSHOT repositories
-libraryDependencies ++=
-  Seq(
-    "edu.berkeley.cs" %% "rocketchip-3.6.0" % "1.6-3.6.0-e3773366a-SNAPSHOT",
-    "edu.berkeley.cs" %% "chisel3" % chiselVersion,
-    "edu.berkeley.cs" %% "chiseltest" % "0.6.2" % "test",
-    "org.scalatest" %% "scalatest" % "3.2.18" % "test",
-  )
-
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-resolvers ++= Resolver.sonatypeOssRepos("releases")
-resolvers += Resolver.mavenLocal
-
-addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full)
 
-import Tests._
-
-Test / fork := true
-Test / testGrouping := (Test / testGrouping).value.flatMap { group =>
-   group.tests.map { test =>
-      Group(test.name, Seq(test), SubProcess(ForkOptions()))
-   }
-}
+lazy val root = (project in file("."))
+  .settings(
+    name := "uciedigital",
+    idePackagePrefix := Some("edu.berkeley.cs.ucie.digital"),
+    libraryDependencies ++=
+      Seq(
+        "edu.berkeley.cs" %% "chisel3" % chiselVersion,
+        "edu.berkeley.cs" %% "chiseltest" % "0.6.2" % Test,
+        "org.scalatest" %% "scalatest" % "3.2.18" % Test,
+        // from Sonatype OSS Snapshot repos
+        "edu.berkeley.cs" %% "rocketchip-3.6.0" % "1.6-3.6.0-e3773366a-SNAPSHOT",
+      ),
+    addCompilerPlugin(
+      "edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full,
+    ),
+    Test / fork := true,
+    Test / testGrouping := (Test / testGrouping).value.flatMap { group =>
+      import Tests._
+      group.tests.map { test =>
+        Group(test.name, Seq(test), SubProcess(ForkOptions()))
+      }
+    },
+    concurrentRestrictions := Seq(Tags.limit(Tags.ForkedTestGroup, 72)),
+  )
 
-concurrentRestrictions := Seq(Tags.limit(Tags.ForkedTestGroup, 72))
+// Plugins
+Global / excludeLintKeys += idePackagePrefix