diff --git a/Justfile b/Justfile
index 671668a..1d78ed6 100644
--- a/Justfile
+++ b/Justfile
@@ -18,12 +18,12 @@ trino-image: trino-plugin
 
 # Run our Trino image.
 docker-run-trino: trino-image
-	docker run --name trino-joinery -p 8080:8080 -d trino-joinery
-	docker exec trino-joinery install-udfs
+	(cd trino && docker compose up)
+	docker compose exec trino install-udfs
 
 # Stop and delete our Trino container.
 docker-rm-trino:
-	docker rm -f trino-joinery
+	(cd trino && docker compose stop && docker compose rm)
 
 # Verify that our image works.
 check:
@@ -35,8 +35,8 @@ check:
 
 # Check Trino. Assumes `docker-run-trino` has been run.
 check-trino:
-	cargo run -- sql-test --database "trino://anyone@localhost/memory/default" ./tests/sql/
+	cargo run -- sql-test --database "trino://admin@localhost/memory/default" ./tests/sql/
 
 # Access a Trino shell.
 trino-shell:
-	docker exec -it trino-joinery trino
\ No newline at end of file
+	docker compose exec trino-joinery trino
\ No newline at end of file
diff --git a/docker/trino/Dockerfile b/docker/trino/Dockerfile
index a174c85..61bab7b 100644
--- a/docker/trino/Dockerfile
+++ b/docker/trino/Dockerfile
@@ -1,7 +1,7 @@
 # A Dockerfile which builds a Trino image with our UDFs.
 
 # Use the official Trino image as the base image.
-FROM trinodb/trino:443
+FROM trinodb/trino:460
 
 # Copy ./java/trino-plugin/target/ to /usr/lib/trino/plugin/joinery.
 ADD ./java/trino-plugin/target/ /usr/lib/trino/plugin/joinery
diff --git a/trino/docker-compose.yml b/trino/docker-compose.yml
index 5b3ccf9..12ea032 100644
--- a/trino/docker-compose.yml
+++ b/trino/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   trino:
     ports:
       - "8080:8080"
-    image: "trinodb/trino:460"
+    image: trino-joinery:latest
     volumes:
       - ./docker/trino/etc:/usr/lib/trino/etc:ro
       - ./docker/trino/catalog:/etc/trino/catalog
@@ -27,9 +27,9 @@ services:
 
   hive-metastore:
     hostname: hive-metastore
-    image: 'starburstdata/hive:3.1.2-e.18'
+    image: "starburstdata/hive:3.1.2-e.18"
     ports:
-      - '9083:9083' # Metastore Thrift
+      - "9083:9083" # Metastore Thrift
     environment:
       HIVE_METASTORE_DRIVER: org.postgresql.Driver
       HIVE_METASTORE_JDBC_URL: jdbc:postgresql://metastore_db:5432/metastore
@@ -60,11 +60,11 @@ services:
 
   minio:
     hostname: minio
-    image: 'minio/minio:RELEASE.2022-05-26T05-48-41Z'
+    image: "minio/minio:RELEASE.2022-05-26T05-48-41Z"
     container_name: minio
     ports:
-      - '9000:9000'
-      - '9001:9001'
+      - "9000:9000"
+      - "9001:9001"
     environment:
       MINIO_ACCESS_KEY: minio
       MINIO_SECRET_KEY: minio123
@@ -72,7 +72,7 @@ services:
 
   # This job will create the "datalake" bucket on Minio
   mc-job:
-    image: 'minio/mc:RELEASE.2022-05-09T04-08-26Z'
+    image: "minio/mc:RELEASE.2022-05-09T04-08-26Z"
     entrypoint: |
       /bin/bash -c "
       sleep 5;
@@ -85,4 +85,3 @@ services:
 networks:
   default:
     name: trino-test
-