diff --git a/Makefile b/Makefile
index ed6ff9ece..1ee6c51b5 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ test-go-units:
 
 .PHONY: test-go-units-crdb
 test-go-units-crdb: cleanup-test-go-units-crdb
-	@docker run -d --name dss-crdb-for-testing -p 26257:26257 -p 8080:8080  cockroachdb/cockroach:v21.2.7 start-single-node --listen-addr=0.0.0.0 --insecure > /dev/null
+	@docker run -d --name dss-crdb-for-testing -p 26257:26257 -p 8080:8080  cockroachdb/cockroach:v24.1.3 start-single-node --listen-addr=0.0.0.0 --insecure > /dev/null
 	@until [ -n "`docker logs dss-crdb-for-testing | grep 'nodeID'`" ]; do echo "Waiting for CRDB to be ready"; sleep 3; done;
 	go run ./cmds/db-manager/main.go --schemas_dir ./build/db_schemas/rid --db_version latest --cockroach_host localhost
 	go test -count=1 -v ./pkg/rid/store/cockroach --cockroach_host localhost --cockroach_port 26257 --cockroach_ssl_mode disable --cockroach_user root --cockroach_db_name rid
diff --git a/build/deploy/metadata_base.libsonnet b/build/deploy/metadata_base.libsonnet
index f94585601..c156c6128 100644
--- a/build/deploy/metadata_base.libsonnet
+++ b/build/deploy/metadata_base.libsonnet
@@ -14,7 +14,7 @@
     shouldInit: false,  // Set this to true if you are starting a new cluster.
     grpc_port: 26257,
     http_port: 8080,
-    image: 'cockroachdb/cockroach:v21.2.7',
+    image: 'cockroachdb/cockroach:v24.1.3',
     nodeIPs: error 'must supply the per-node ip addresses as an array', // For AWS, this array should contain the allocation id of the elastic ips.
     JoinExisting: [],
     storageClass: 'standard',
diff --git a/build/dev/docker-compose_dss.yaml b/build/dev/docker-compose_dss.yaml
index e84e4d078..3ce9dad1f 100644
--- a/build/dev/docker-compose_dss.yaml
+++ b/build/dev/docker-compose_dss.yaml
@@ -8,7 +8,7 @@ version: '3.8'
 services:
 
   local-dss-crdb:
-    image: cockroachdb/cockroach:v21.2.7
+    image: cockroachdb/cockroach:v24.1.3
     command: start-single-node --insecure
     ports:
       - "26257:26257"
diff --git a/cmds/core-service/README.md b/cmds/core-service/README.md
index 40e2573c4..bf58c629e 100644
--- a/cmds/core-service/README.md
+++ b/cmds/core-service/README.md
@@ -32,7 +32,7 @@ go run ./cmds/core-service \
 To run correctly, core-service must be able to [access](../../pkg/cockroach/flags/flags.go) a CockroachDB cluster.  Provision of this cluster is handled automatically for a local development environment if following [the instructions for a standalone instance](../../build/dev/standalone_instance.md).  Or, a CockroachDB instance can be created manually with:
 
 ```bash
-docker container run -p 26257:26257 -p 8080:8080 --rm cockroachdb/cockroach:v21.2.7 start-single-node --insecure
+docker container run -p 26257:26257 -p 8080:8080 --rm cockroachdb/cockroach:v24.1.3 start-single-node --insecure
 ```
 
 #### Database configuration
diff --git a/deploy/operations/Dockerfile b/deploy/operations/Dockerfile
index 3d7eb0e2f..2e969f7ff 100644
--- a/deploy/operations/Dockerfile
+++ b/deploy/operations/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-ENV COCKROACH_VERSION 21.2.7
+ENV COCKROACH_VERSION 24.1.3
 
 RUN  apt-get update \
 && apt-get install -y unzip curl gnupg lsb-release apt-transport-https ca-certificates
diff --git a/deploy/services/helm-charts/dss/values.yaml b/deploy/services/helm-charts/dss/values.yaml
index 1b1af3a7c..7eaeb42d7 100644
--- a/deploy/services/helm-charts/dss/values.yaml
+++ b/deploy/services/helm-charts/dss/values.yaml
@@ -3,7 +3,7 @@ cockroachdb:
   # See https://github.com/cockroachdb/helm-charts/blob/master/cockroachdb/values.yaml
   image:
     repository: cockroachdb/cockroach
-    tag: v21.2.7
+    tag: v24.1.3
   tls:
     certs:
       provided: true
diff --git a/test/migrations/clear_db.sh b/test/migrations/clear_db.sh
index 15d5194f9..abde3240d 100755
--- a/test/migrations/clear_db.sh
+++ b/test/migrations/clear_db.sh
@@ -8,5 +8,5 @@ echo "Starting CRDB container"
 docker run -d --rm --name dss-crdb-for-migration-testing \
 	-p 26257:26257 \
 	-p 8080:8080 \
-  cockroachdb/cockroach:v21.2.7 start-single-node \
+  cockroachdb/cockroach:v24.1.3 start-single-node \
   --insecure > /dev/null