diff --git a/Cargo.lock b/Cargo.lock
index 55a61c698ea..38aa92369b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2683,7 +2683,7 @@ dependencies = [
  "base64 0.13.1",
  "bitflags 1.3.2",
  "generic-array",
- "jsonwebtoken 8.3.0",
+ "jsonwebtoken",
  "num-bigint",
  "p256",
  "rand 0.8.5",
@@ -2708,33 +2708,6 @@ dependencies = [
  "simple_asn1",
 ]
 
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.0"
-source = "git+https://github.com/jsdt/jsonwebtoken.git?rev=7f0cef63c74f58dfa912e88da844932ba4c71562#7f0cef63c74f58dfa912e88da844932ba4c71562"
-dependencies = [
- "base64 0.21.7",
- "js-sys",
- "pem 3.0.4",
- "ring 0.17.8",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
-[[package]]
-name = "jwks"
-version = "0.1.3"
-source = "git+https://github.com/jsdt/jwks.git?rev=acb4241f3768ff89515a0c12d927e280a604fff3#acb4241f3768ff89515a0c12d927e280a604fff3"
-dependencies = [
- "base64 0.21.7",
- "jsonwebtoken 9.3.0",
- "reqwest 0.11.27",
- "serde",
- "thiserror",
- "tokio",
-]
-
 [[package]]
 name = "keccak"
 version = "0.1.5"
@@ -4873,7 +4846,6 @@ dependencies = [
  "insta",
  "is-terminal",
  "itertools 0.12.1",
- "jsonwebtoken 9.3.0",
  "mimalloc",
  "regex",
  "reqwest 0.12.4",
@@ -4886,6 +4858,7 @@ dependencies = [
  "spacetimedb-core",
  "spacetimedb-data-structures",
  "spacetimedb-fs-utils",
+ "spacetimedb-jsonwebtoken",
  "spacetimedb-lib",
  "spacetimedb-primitives",
  "spacetimedb-schema",
@@ -4926,7 +4899,6 @@ dependencies = [
  "hyper-util",
  "itoa",
  "jsonwebkey",
- "jsonwebtoken 9.3.0",
  "lazy_static",
  "log",
  "mime",
@@ -4939,6 +4911,7 @@ dependencies = [
  "spacetimedb-client-api-messages",
  "spacetimedb-core",
  "spacetimedb-data-structures",
+ "spacetimedb-jsonwebtoken",
  "spacetimedb-lib",
  "spacetimedb-schema",
  "tempfile",
@@ -5033,8 +5006,6 @@ dependencies = [
  "indexmap 2.6.0",
  "itertools 0.12.1",
  "jsonwebkey",
- "jsonwebtoken 9.3.0",
- "jwks",
  "lazy_static",
  "log",
  "once_cell",
@@ -5067,6 +5038,8 @@ dependencies = [
  "spacetimedb-data-structures",
  "spacetimedb-durability",
  "spacetimedb-expr",
+ "spacetimedb-jsonwebtoken",
+ "spacetimedb-jwks",
  "spacetimedb-lib",
  "spacetimedb-metrics",
  "spacetimedb-primitives",
@@ -5157,6 +5130,35 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "spacetimedb-jsonwebtoken"
+version = "9.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f626b7b56a60c3ec4552bc928a4e26b12ec76af826c0b152a87811fb4a68544f"
+dependencies = [
+ "base64 0.22.1",
+ "js-sys",
+ "pem 3.0.4",
+ "ring 0.17.8",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
+[[package]]
+name = "spacetimedb-jwks"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b87fbe70b43e34cb9ee9db5e6fdffab259932fa931fcf8283fd9e92d7c117c93"
+dependencies = [
+ "base64 0.22.1",
+ "reqwest 0.11.27",
+ "serde",
+ "spacetimedb-jsonwebtoken",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "spacetimedb-lib"
 version = "1.0.0-rc2"
diff --git a/Cargo.toml b/Cargo.toml
index b137e6fa69e..33103fe5107 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,7 +172,7 @@ indicatif = "0.16"
 insta = { version = "1.21.0", features = ["toml"] }
 is-terminal = "0.4"
 itertools = "0.12"
-jsonwebtoken = { git = "https://github.com/jsdt/jsonwebtoken.git", rev = "7f0cef63c74f58dfa912e88da844932ba4c71562"}
+jsonwebtoken = { package = "spacetimedb-jsonwebtoken", version = "9.3.0" }
 lazy_static = "1.4.0"
 log = "0.4.17"
 mimalloc = "0.1.39"
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 5d2d364ad2d..7d495cf345f 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -101,7 +101,7 @@ url.workspace = true
 urlencoding.workspace = true
 uuid.workspace = true
 wasmtime.workspace = true
-jwks = { git = "https://github.com/jsdt/jwks.git", rev = "acb4241f3768ff89515a0c12d927e280a604fff3"}
+jwks = { package = "spacetimedb-jwks", version = "0.1.3" }
 async_cache = "0.3.1"
 faststr = "0.2.23"
 
diff --git a/crates/sdk/tests/test-client/src/main.rs b/crates/sdk/tests/test-client/src/main.rs
index d9a9ec8835a..bc186e13d9c 100644
--- a/crates/sdk/tests/test-client/src/main.rs
+++ b/crates/sdk/tests/test-client/src/main.rs
@@ -4,10 +4,7 @@ mod module_bindings;
 
 use module_bindings::*;
 
-use spacetimedb_sdk::{
-    credentials, i256, u256, Address, DbContext, Event, Identity,
-    ReducerEvent, Status, Table,
-};
+use spacetimedb_sdk::{credentials, i256, u256, Address, DbContext, Event, Identity, ReducerEvent, Status, Table};
 use test_counter::TestCounter;
 
 mod simple_test_table;
diff --git a/crates/sql-parser/LICENSE b/crates/sql-parser/LICENSE
new file mode 100644
index 00000000000..e69de29bb2d