diff --git a/.gitmodules b/.gitmodules
index 26846989..cad55a67 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "tools/treadle"]
 	path = tools/treadle
 	url = https://github.com/freechipsproject/treadle.git
+[submodule "generators/rocc-template"]
+	path = generators/sha3
+	url = https://github.com/ucb-bar/rocc-template.git
diff --git a/build.sbt b/build.sbt
index 8e09a6ab..1dbaf219 100644
--- a/build.sbt
+++ b/build.sbt
@@ -106,7 +106,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
   .settings(commonSettings)
 
 lazy val example = conditionalDependsOn(project in file("generators/example"))
-  .dependsOn(boom, hwacha, sifive_blocks, sifive_cache, utilities)
+  .dependsOn(boom, hwacha, sifive_blocks, sifive_cache, utilities, sha3)
   .settings(commonSettings)
 
 lazy val tracegen = conditionalDependsOn(project in file("generators/tracegen"))
@@ -129,6 +129,10 @@ lazy val boom = (project in file("generators/boom"))
   .dependsOn(rocketchip)
   .settings(commonSettings)
 
+lazy val sha3 = (project in file("generators/sha3"))
+  .dependsOn(rocketchip, `chisel-testers`)
+  .settings(commonSettings)
+
 lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeout/"))
   .settings(commonSettings)
 
diff --git a/generators/example/src/main/scala/RocketConfigs.scala b/generators/example/src/main/scala/RocketConfigs.scala
index ede2701b..21a7d13a 100644
--- a/generators/example/src/main/scala/RocketConfigs.scala
+++ b/generators/example/src/main/scala/RocketConfigs.scala
@@ -100,3 +100,10 @@ class GB1MemoryRocketConfig extends Config(
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
   new freechips.rocketchip.system.BaseConfig)
 
+class Sha3RocketConfig extends Config(
+  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
+  new WithTop ++
+  new WithBootROM ++
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new freechips.rocketchip.subsystem.WithNBigCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)
diff --git a/generators/sha3 b/generators/sha3
new file mode 160000
index 00000000..83dd1955
--- /dev/null
+++ b/generators/sha3
@@ -0,0 +1 @@
+Subproject commit 83dd1955a9a6f277addfbcc65394986e73fc03b2
diff --git a/toolchains/esp-tools b/toolchains/esp-tools
index aba7bd82..dcb6012f 160000
--- a/toolchains/esp-tools
+++ b/toolchains/esp-tools
@@ -1 +1 @@
-Subproject commit aba7bd828d4fd1c5fc3ac227524ccfd350410ade
+Subproject commit dcb6012f77101e793948cc90ac31b3735a9f3f6d