diff --git a/docker/compose/zrok-private-access/docker-compose.yml b/docker/compose/zrok-private-access/docker-compose.yml
index ba9784ee..88baa15d 100644
--- a/docker/compose/zrok-private-access/docker-compose.yml
+++ b/docker/compose/zrok-private-access/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     volumes:
       - zrok_env:/mnt/.zrok
   zrok-enable:
-    image: docker.io/openziti/zrok:enable-headless  # FIXME: resume :latest if >= :0.3.2
+    image: docker.io/openziti/zrok
     depends_on:
       zrok-enable-init:
         condition: service_completed_successfully
@@ -29,17 +29,15 @@ services:
     environment:
       HOME: /mnt
       ZROK_ENABLE_TOKEN:
-      ZROK_API_ENDPOINT: https://api.zrok.io/
+      ZROK_API_ENDPOINT: ${ZROK_API_ENDPOINT:-https://api.zrok.io/}
   zrok-private-access:
     image: docker.io/openziti/zrok
-    command: access private --bind 0.0.0.0:9191 ${ZROK_ACCESS_TOKEN}
+    command: access private --headless --bind 0.0.0.0:9191 ${ZROK_ACCESS_TOKEN}
     depends_on:
       zrok-enable:
         condition: service_completed_successfully
     ports:
       - 9191:9191  # expose the zrok private access proxy to the Docker host
-    stdin_open: true  # FIXME: remove when --headless is available
-    tty: true         # FIXME: remove when --headless is available
     volumes:
       - zrok_env:/mnt/.zrok
     environment:
diff --git a/docker/compose/zrok-private-share/docker-compose.yml b/docker/compose/zrok-private-share/docker-compose.yml
index aeac142b..d0a2647a 100644
--- a/docker/compose/zrok-private-share/docker-compose.yml
+++ b/docker/compose/zrok-private-share/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     volumes:
       - zrok_env:/mnt/.zrok
   zrok-enable:
-    image: docker.io/openziti/zrok:enable-headless  # FIXME: resume :latest if >= :0.3.2
+    image: docker.io/openziti/zrok
     depends_on:
       zrok-enable-init:
         condition: service_completed_successfully
@@ -29,10 +29,10 @@ services:
     environment:
       HOME: /mnt
       ZROK_ENABLE_TOKEN:
-      ZROK_API_ENDPOINT: https://api.zrok.io/
+      ZROK_API_ENDPOINT: ${ZROK_API_ENDPOINT:-https://api.zrok.io/}
   zrok-private-share:
     image: docker.io/openziti/zrok
-    command: share private --headless http://zrok-test:8080
+    command: share private --headless http://zrok-test:9090
     depends_on:
       zrok-enable:
         condition: service_completed_successfully
diff --git a/docker/compose/zrok-public-share/docker-compose.yml b/docker/compose/zrok-public-share/docker-compose.yml
index aa3ba018..7fb0e4d0 100644
--- a/docker/compose/zrok-public-share/docker-compose.yml
+++ b/docker/compose/zrok-public-share/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     volumes:
       - zrok_env:/mnt/.zrok
   zrok-enable:
-    image: docker.io/openziti/zrok:enable-headless  # FIXME: resume :latest if >= :0.3.2
+    image: docker.io/openziti/zrok
     depends_on:
       zrok-enable-init:
         condition: service_completed_successfully
@@ -29,7 +29,7 @@ services:
     environment:
       HOME: /mnt
       ZROK_ENABLE_TOKEN:
-      ZROK_API_ENDPOINT: https://api.zrok.io
+      ZROK_API_ENDPOINT: ${ZROK_API_ENDPOINT:-https://api.zrok.io/}
   zrok-public-share:
     image: docker.io/openziti/zrok
     command: share public --headless http://zrok-test:9090