diff --git a/.github/workflows/bolt-test.yaml b/.github/workflows/bolt-test.yaml
index 81674a4014..4ba7014e53 100644
--- a/.github/workflows/bolt-test.yaml
+++ b/.github/workflows/bolt-test.yaml
@@ -37,13 +37,9 @@ jobs:
       - name: Bolt Test
         run: nix-shell --pure --run "bolt test"
 
-      - name: Tmate
-        if: failure()
-        uses: mxschmitt/action-tmate@v3
-
-      # - name: K3D Cleanup
-      #   if: always()
-      #   run: nix-shell --pure --run "k3d cluster delete rivet-ci"
+      - name: K3D Cleanup
+        if: always()
+        run: nix-shell --pure --run "k3d cluster delete rivet-ci"
 
       - name: Force Parallel Failure
         if: failure()
diff --git a/lib/bolt/core/src/utils/db_conn.rs b/lib/bolt/core/src/utils/db_conn.rs
index 5c6991770d..f1b1f5ac74 100644
--- a/lib/bolt/core/src/utils/db_conn.rs
+++ b/lib/bolt/core/src/utils/db_conn.rs
@@ -1,4 +1,5 @@
 use std::{collections::HashMap, sync::Arc};
+use urlencoding::encode;
 
 use anyhow::*;
 
@@ -179,7 +180,10 @@ impl DatabaseConnections {
 
 				Ok(format!(
 					"cockroach://{}:{}@{}/{}?sslmode=verify-ca&sslrootcert=/local/crdb-ca.crt",
-					username, password, host, full_db_name
+					encode(&username),
+					encode(&password),
+					host,
+					encode(&full_db_name),
 				))
 			}
 			RuntimeKind::ClickHouse { .. } => {
@@ -196,7 +200,11 @@ impl DatabaseConnections {
 
 				Ok(format!(
 					"clickhouse://{}/?database={}&username={}&password={}{}",
-					host, db_name, clickhouse_user, clickhouse_password, query_other
+					host,
+					encode(&db_name),
+					encode(&clickhouse_user),
+					encode(&clickhouse_password),
+					query_other,
 				))
 			}
 			x @ _ => bail!("cannot migrate this type of service: {x:?}"),