diff --git a/.env.example b/.env.example
index a46e62e..6902d06 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1,5 @@
 # Image and host paths
-CODEX_IMAGE=ghcr.io/experience83/codex-remote-dev:stable
+CODEX_IMAGE=ghcr.io/experience83/codex-remote-dev:edge-amd64
 CODEX_DATA_ROOT=./data
 WEB_PASSWORD_PATH=./secrets/web_password.txt
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 950a2ce..7e45568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - Updated maintained GitHub Actions to their current major releases.
 - Changed the edge channel from private validation to public experimental development testing.
 - Updated project documentation to state clearly that no stable release exists yet.
+- Changed the generic and TrueNAS Compose defaults to the published `edge-amd64` image until the first stable release exists.
 
 ### Security
 
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index f953532..a6f0c5a 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   codex:
-    image: ${CODEX_IMAGE:-ghcr.io/experience83/codex-remote-dev:stable}
+    image: ${CODEX_IMAGE:-ghcr.io/experience83/codex-remote-dev:edge-amd64}
     container_name: codex-remote-dev
     restart: unless-stopped
     user: "0:0"
diff --git a/compose/truenas.yml b/compose/truenas.yml
index 8c99a34..f0a6892 100644
--- a/compose/truenas.yml
+++ b/compose/truenas.yml
@@ -1,6 +1,6 @@
 services:
   codex:
-    image: ${CODEX_IMAGE:-ghcr.io/experience83/codex-remote-dev:stable}
+    image: ${CODEX_IMAGE:-ghcr.io/experience83/codex-remote-dev:edge-amd64}
     container_name: codex-remote-dev
     restart: unless-stopped
     user: "0:0"