diff --git a/scripts/cluster-migration/schema.sql b/scripts/cluster-migration/schema.sql
index 7f99844a..7ff59c8d 100644
--- a/scripts/cluster-migration/schema.sql
+++ b/scripts/cluster-migration/schema.sql
@@ -218,8 +218,9 @@ ALTER TABLE event_detector_changepoints ON CLUSTER oonidata_cluster ADD COLUMN `
 -- faulty measurements
 CREATE TABLE IF NOT EXISTS faulty_measurements ON CLUSTER oonidata_cluster
 (
-    `ts` DateTime64(3, 'UTC'),
+    `ts` DateTime64(3, 'UTC') DEFAULT now64(),
     `type` String,
+    `uid` UUID DEFAULT generateUUIDv4(),
     -- geoip lookup result for the probe IP
     `probe_cc` String,
     `probe_asn` UInt32,
@@ -230,4 +231,4 @@ ENGINE = ReplicatedReplacingMergeTree (
         '/clickhouse/{cluster}/tables/ooni/faulty_measurements/{shard}',
         '{replica}'
 )
-ORDER BY (ts, type, probe_cc, probe_asn);
+ORDER BY (ts, type, probe_cc, probe_asn, uid);
diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf
index 1261c64d..196248e7 100644
--- a/tf/environments/dev/main.tf
+++ b/tf/environments/dev/main.tf
@@ -241,7 +241,7 @@ data "aws_ssm_parameter" "clickhouse_readonly_test_url" {
 }
 
 data "aws_ssm_parameter" "clickhouse_write_url" {
-  name = "/oonidevops/secrets/clickhouse_write_password"
+  name = "/oonidevops/secrets/clickhouse_write_url"
 }
 
 data "aws_ssm_parameter" "account_id_hashing_key" {
@@ -554,7 +554,7 @@ module "ooniapi_ooniprobe_deployer" {
 
   service_name            = "ooniprobe"
   repo                    = "ooni/backend"
-  branch_name             = "geoip-heuristic"
+  branch_name             = "master"
   trigger_path            = "ooniapi/services/ooniprobe/**"
   buildspec_path          = "ooniapi/services/ooniprobe/buildspec.yml"
   codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
diff --git a/tf/environments/prod/main.tf b/tf/environments/prod/main.tf
index 693b54de..0c3827be 100644
--- a/tf/environments/prod/main.tf
+++ b/tf/environments/prod/main.tf
@@ -807,7 +807,7 @@ module "ooniapi_ooniprobe" {
     POSTGRESQL_URL              = data.aws_ssm_parameter.oonipg_url.arn
     JWT_ENCRYPTION_KEY          = data.aws_ssm_parameter.jwt_secret.arn
     PROMETHEUS_METRICS_PASSWORD = data.aws_ssm_parameter.prometheus_metrics_password.arn
-    CLICKHOUSE_URL              = data.aws_ssm_parameter.clickhouse_readonly_url.arn
+    CLICKHOUSE_URL              = data.aws_ssm_parameter.clickhouse_write_url.arn
     ANONC_SECRET_KEY            = data.aws_ssm_parameter.anonc_secret_key.arn
   }