From c0ec8f72c8e6f29afd95750f37f948a92e3e46ee Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:07:07 -0400
Subject: [PATCH 1/6] make actions happen

---
 .github/workflows/apptainer-build-local.yml |  5 ++++
 .github/workflows/test-upload-local.yml     |  8 +++++
 .github/workflows/test-upload-nginx.yml     |  6 ++++
 Makefile                                    | 24 ++++++++++++++-
 docker-compose-nginx.yml                    | 33 ++++++++++++++++-----
 docker-compose.yml                          | 28 ++++++++++++-----
 6 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/apptainer-build-local.yml b/.github/workflows/apptainer-build-local.yml
index 09705b56..3c12f9c0 100644
--- a/.github/workflows/apptainer-build-local.yml
+++ b/.github/workflows/apptainer-build-local.yml
@@ -135,4 +135,9 @@ jobs:
             exit 1
           fi
       
+      - name: Push Images
+        if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'workflow_dispatch'
+        run: |
+          docker login ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_PASSWORD }}
+          make docker-push-everything
 
diff --git a/.github/workflows/test-upload-local.yml b/.github/workflows/test-upload-local.yml
index d66023d0..f22bfc16 100644
--- a/.github/workflows/test-upload-local.yml
+++ b/.github/workflows/test-upload-local.yml
@@ -1,6 +1,8 @@
 name: Test Local Upload
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
   workflow_run:
@@ -103,3 +105,9 @@ jobs:
       - name: Run upload test
         run: |
           make test-upload
+
+      - name: Push Images
+        if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'workflow_dispatch'
+        run: |
+          docker login ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_PASSWORD }}
+          make docker-local-push
\ No newline at end of file
diff --git a/.github/workflows/test-upload-nginx.yml b/.github/workflows/test-upload-nginx.yml
index 89671b00..f4d3971b 100644
--- a/.github/workflows/test-upload-nginx.yml
+++ b/.github/workflows/test-upload-nginx.yml
@@ -137,3 +137,9 @@ jobs:
       - name: Run upload test
         run: |
           make test-upload
+
+      - name: Push Images
+        if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'workflow_dispatch'
+        run: |
+          docker login ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_PASSWORD }}
+          make docker-nginx-push
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 36e0f57e..0845cf2d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,4 +26,26 @@ test-upload: setup-test
 clean-test:
 	rm -rf test/.venv
 	rm -rf test/__pycache__
-	rm -rf test/.pytest_cache
\ No newline at end of file
+	rm -rf test/.pytest_cache
+
+# build local (non-nginx)
+docker-build-local:
+	EZBIDS_VERSION=$(shell git describe --tags --always) docker compose build
+
+# build nginx (non-nginx)
+docker-build-nginx:
+	EZBIDS_VERSION=$(shell git describe --tags --always) docker compose -f docker-compose-nginx.yml build
+
+docker-local-push:
+	EZBIDS_VERSION=$(shell git describe --tags --always) docker compose push
+
+docker-nginx-push:
+	EZBIDS_VERSION=$(shell git describe --tags --always) docker compose -f docker-compose-nginx.yml push
+
+docker-build-everything:
+	docker build -f EverythingDockerfile -t openneuropet/ezbids-everything:latest .
+	docker build -f EverythingDockerfile -t openneuropet/ezbids-everything:$(shell git describe --tags --always) .
+
+docker-push-everything:
+	docker push openneuropet/ezbids-everything:latest
+	docker push openneuropet/ezbids-everything:$(shell git describe --tags --always)
\ No newline at end of file
diff --git a/docker-compose-nginx.yml b/docker-compose-nginx.yml
index cf3319ae..c090e97a 100644
--- a/docker-compose-nginx.yml
+++ b/docker-compose-nginx.yml
@@ -3,7 +3,7 @@ networks:
 
 services:
     mongodb:
-        container_name: brainlife_ezbids-mongodb
+        container_name: openneuropet/ezbids-mongodb
         image: mongo:4.4.15
         platform: linux/amd64
         volumes:
@@ -18,8 +18,13 @@ services:
             - ezbids
 
     api:
-        container_name: brainlife_ezbids-api
-        build: .
+        container_name: openneuropet/ezbids-api
+        image: openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
+        build: 
+            context: .
+            tags: 
+                - openneuropet/ezbids-api:latest
+                - openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
         platform: linux/amd64
         volumes:
             - ${EZBIDS_TMP_DIR:-/tmp/ezbids-workdir}:/tmp
@@ -38,9 +43,13 @@ services:
             - ezbids
 
     handler:
-        container_name: brainlife_ezbids-handler
+        container_name: openneuropet/ezbids-handler
+        image: openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
         build:
             context: .
+            tags: 
+                - openneuropet/ezbids-handler:latest
+                - openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
             dockerfile: handler/Dockerfile
         platform: linux/amd64
         volumes:
@@ -61,9 +70,13 @@ services:
     ui:
         # we only run this container to build the UI pages to mount into a volume
         # for use in the nginx container.
-        container_name: brainlife_ezbids-ui-builder
+        container_name: openneuropet/ezbids-ui-builder
+        image: openneuropet/ezbids-ui-nginx:${EZBIDS_VERSION:-latest}
         build: 
             context: ./ui/
+            tags: 
+                - openneuropet/ezbids-ui-nginx:latest
+                - openneuropet/ezbids-ui-nginx:${EZBIDS_VERSION:-latest}
             dockerfile: Dockerfile-production
         platform: linux/amd64
         environment:
@@ -76,8 +89,12 @@ services:
 
     # by default this is not enabled, add COMPOSE_PROFILES=telemetry to your .env
     telemetry:
-        container_name: brainlife_ezbids-telemetry
-        build: ./telemetry
+        container_name: openneuropet/ezbids-telemetry
+        build: 
+            context: ./telemetry
+            tags: 
+                - openneuropet/ezbids-telemetry:latest
+                - openneuropet/ezbids-telemetry:${EZBIDS_VERSION:-latest}
         platform: linux/amd64
         depends_on:
             - mongodb
@@ -86,7 +103,7 @@ services:
             - ezbids
 
     nginx:
-        container_name: brainlife_ezbids-nginx
+        container_name: openneuropet/ezbids-nginx
         depends_on:
             - ui
             - api
diff --git a/docker-compose.yml b/docker-compose.yml
index 08de1b6a..98ad3c35 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
     mongodb:
-        container_name: brainlife_ezbids-mongodb
+        container_name: openneuropet/ezbids-mongodb
         image: mongo:4.4.15
         platform: linux/amd64
         volumes:
@@ -21,8 +21,13 @@ services:
             - ezbids
 
     api:
-        container_name: brainlife_ezbids-api
-        build: .
+        container_name: openneuropet/ezbids-api
+        image: openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
+        build: 
+            context: .
+            tags: 
+                - openneuropet/ezbids-api:latest
+                - openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
         platform: linux/amd64
         volumes:
             - ${EZBIDS_TMP_DIR:-/tmp/ezbids-workdir/}:/tmp
@@ -47,9 +52,13 @@ services:
             - ezbids
 
     handler:
-        container_name: brainlife_ezbids-handler
+        container_name: openneuropet/ezbids-handler
+        image: openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
         build:
             context: .
+            tags: 
+                - openneuropet/ezbids-handler:latest
+                - openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
             dockerfile: handler/Dockerfile
         platform: linux/amd64
         volumes:
@@ -68,8 +77,13 @@ services:
         command: pm2 start handler.js --attach --watch --ignore-watch "ui **/node_modules **__pycache__**"
 
     ui:
-        container_name: brainlife_ezbids-ui
-        build: ./ui
+        container_name: openneuropet/ezbids-ui
+        image: openneuropet/ezbids-ui:${EZBIDS_VERSION:-latest}
+        build: 
+            context: ./ui
+            tags: 
+                - openneuropet/ezbids-ui:latest
+                - openneuropet/ezbids-ui:${EZBIDS_VERSION:-latest}
         platform: linux/amd64
         environment:
             VITE_APIHOST: http://${SERVER_NAME:-localhost}:8082
@@ -91,7 +105,7 @@ services:
 
     # by default this is not enabled, need to run docker compose with --profile development to enable this service
     telemetry:
-        container_name: brainlife_ezbids-telemetry
+        container_name: openneuropet/ezbids-telemetry
         build: ./telemetry
         platform: linux/amd64
         depends_on:

From c19120b357a7bafcc82bb9615ddea12ed3a31453 Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:23:21 -0400
Subject: [PATCH 2/6] slimming down workflows and docker steps

---
 .github/workflows/apptainer-build-local.yml | 34 ++-------------------
 .github/workflows/test-upload-local.yml     | 24 ++++++++++++---
 .github/workflows/test-upload-nginx.yml     | 29 +++++++++++++++---
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/apptainer-build-local.yml b/.github/workflows/apptainer-build-local.yml
index 3c12f9c0..e4841494 100644
--- a/.github/workflows/apptainer-build-local.yml
+++ b/.github/workflows/apptainer-build-local.yml
@@ -1,6 +1,8 @@
 name: Test Apptainer Build Local
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
   workflow_run:
@@ -41,19 +43,6 @@ jobs:
         run: |
           make get-test-data
 
-      - name: Cache Docker images
-        uses: actions/cache@v4
-        id: docker-cache
-        with:
-          path: |
-            mongo.tar
-            api.tar
-            handler.tar
-            ui.tar
-          key: docker-local-images-${{ github.event.workflow_run.head_sha || github.sha }}
-          restore-keys: |
-            docker-local-images-
-
       - name: Setup environment
         run: |
           # copy the example.env to .env
@@ -61,26 +50,7 @@ jobs:
 
           # Update .env to use the hostname
           sed -i "s/SERVER_NAME=.*/SERVER_NAME=localhost/" .env
-
-      - name: Build or load images
-        run: |
-          if [ -f mongo.tar ] && [ -f api.tar ] && [ -f handler.tar ] && [ -f ui.tar ]; then
-            echo "Loading cached images..."
-            if ! docker load < mongo.tar || ! docker load < api.tar || ! docker load < handler.tar || ! docker load < ui.tar; then
-              echo "Failed to load cached images, building instead..."
-              docker compose -f ${{ env.COMPOSE_FILE }} build
-            else
-              rm mongo.tar api.tar handler.tar ui.tar
-            fi
-          else
-            echo "Building images..."
-            docker compose -f ${{ env.COMPOSE_FILE }} build
-          fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
 
       - name: Clean Up some More Space
         run: bash .github/scripts/util_free_space.sh
diff --git a/.github/workflows/test-upload-local.yml b/.github/workflows/test-upload-local.yml
index f22bfc16..4170c5ea 100644
--- a/.github/workflows/test-upload-local.yml
+++ b/.github/workflows/test-upload-local.yml
@@ -79,10 +79,26 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
+
+      - name: Save images to cache
+        run: |
+          # Save images for future use
+          docker save mongo:4.4.15 > mongo.tar
+          docker save openneuropet/ezbids-api:latest > api.tar
+          docker save openneuropet/ezbids-handler:latest > handler.tar
+          docker save openneuropet/ezbids-ui:latest > ui.tar
+
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        with:
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui.tar
+          key: test-local-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
+          restore-keys: |
+            test-local-docker-images-
 
       - name: Start services
         run: |
diff --git a/.github/workflows/test-upload-nginx.yml b/.github/workflows/test-upload-nginx.yml
index f4d3971b..9d479d0a 100644
--- a/.github/workflows/test-upload-nginx.yml
+++ b/.github/workflows/test-upload-nginx.yml
@@ -1,6 +1,8 @@
 name: Test Nginx Upload
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
   workflow_run:
@@ -89,9 +91,6 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
 
       - name: Build or load nginx images
         run: |
@@ -108,8 +107,28 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the UI image to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
+
+      - name: Save nginx images to cache
+        run: |
+          # Save nginx-specific images for future use
+          docker save mongo:4.4.15 > mongo.tar
+          docker save openneuropet/ezbids-api:latest > api.tar
+          docker save openneuropet/ezbids-handler:latest > handler.tar
+          docker save openneuropet/ezbids-ui-nginx:latest > ui-nginx.tar
+          docker save nginx:latest > nginx.tar
+
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        with:
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui-nginx.tar
+            nginx.tar
+          key: test-nginx-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
+          restore-keys: |
+            test-nginx-docker-images-
 
       - name: Do additional Nginx setup
         run: |

From 329e3a21bb8c09d5ab1bf665c18ada49338fb716 Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 16:48:53 -0400
Subject: [PATCH 3/6] update names

---
 .github/workflows/docker-build-local.yml | 6 +++---
 .github/workflows/docker-build-nginx.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build-local.yml b/.github/workflows/docker-build-local.yml
index 127f01da..ef99664c 100644
--- a/.github/workflows/docker-build-local.yml
+++ b/.github/workflows/docker-build-local.yml
@@ -32,9 +32,9 @@ jobs:
         run: |
           # Save images to tar files
           docker save mongo > mongo.tar
-          docker save ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest > api.tar
-          docker save ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest > handler.tar
-          docker save ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest > ui.tar
+          docker save openneuropet/ezbids-api:latest > api.tar
+          docker save openneuropet/ezbids-handler:latest > handler.tar
+          docker save openneuropet/ezbids-ui:latest > ui.tar
 
       - name: Cache Docker images
         uses: actions/cache@v4
diff --git a/.github/workflows/docker-build-nginx.yml b/.github/workflows/docker-build-nginx.yml
index 78e5ce25..0d474a91 100644
--- a/.github/workflows/docker-build-nginx.yml
+++ b/.github/workflows/docker-build-nginx.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Save images
         run: |
           # Save all ui and nginx images to tar files
-          docker save ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest > ui-nginx.tar
+          docker save openneuropet/ezbids-ui-nginx:latest > ui-nginx.tar
           docker save nginx > nginx.tar
 
       - name: Cache Nginx images

From e8261c0bde520e42f9732b9e6ed68933746f107b Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 16:56:39 -0400
Subject: [PATCH 4/6] maybe I shouldn't cache

---
 .../docker-build-everything-image.yaml        | 52 ++++++-------------
 .github/workflows/test-upload-local.yml       | 20 -------
 .github/workflows/test-upload-nginx.yml       | 23 --------
 3 files changed, 15 insertions(+), 80 deletions(-)

diff --git a/.github/workflows/docker-build-everything-image.yaml b/.github/workflows/docker-build-everything-image.yaml
index 18a45d58..ac7bf965 100644
--- a/.github/workflows/docker-build-everything-image.yaml
+++ b/.github/workflows/docker-build-everything-image.yaml
@@ -41,19 +41,6 @@ jobs:
         run: |
           make get-test-data
 
-      - name: Cache Docker images
-        uses: actions/cache@v4
-        id: docker-cache
-        with:
-          path: |
-            mongo.tar
-            api.tar
-            handler.tar
-            ui.tar
-          key: docker-local-images-${{ github.event.workflow_run.head_sha || github.sha }}
-          restore-keys: |
-            docker-local-images-
-
       - name: Setup environment
         run: |
           # copy the example.env to .env
@@ -62,29 +49,22 @@ jobs:
           # Update .env to use the hostname
           sed -i "s/SERVER_NAME=.*/SERVER_NAME=localhost/" .env
 
-      - name: Build or load images
-        run: |
-          if [ -f mongo.tar ] && [ -f api.tar ] && [ -f handler.tar ] && [ -f ui.tar ]; then
-            echo "Loading cached images..."
-            if ! docker load < mongo.tar || ! docker load < api.tar || ! docker load < handler.tar || ! docker load < ui.tar; then
-              echo "Failed to load cached images, building instead..."
-              docker compose -f ${{ env.COMPOSE_FILE }} build
-            else
-              rm mongo.tar api.tar handler.tar ui.tar
-            fi
-          else
-            echo "Building images..."
-            docker compose -f ${{ env.COMPOSE_FILE }} build
-          fi
-          
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
-
       - name: Build Single Docker Image
         run: |
-          docker build -f EverythingDockerfile -t ezbids-everything .
+          docker build -f EverythingDockerfile -t openneuropet/ezbids-everything .
+      
+      - name: Save everything image to cache
+        run: |
+          docker save openneuropet/ezbids-everything > everything.tar
+
+      - name: Cache everything image
+        uses: actions/cache@v4
+        with:
+          path: |
+            everything.tar
+          key: docker-everything-images-${{ github.sha }}
+          restore-keys: |
+            docker-everything-images-
 
       - name: Start Services
         run: |
@@ -100,6 +80,4 @@ jobs:
       - name: Run upload test
         run: |
           make test-upload
-
-      
-
+ 
\ No newline at end of file
diff --git a/.github/workflows/test-upload-local.yml b/.github/workflows/test-upload-local.yml
index 4170c5ea..c0ab2ca6 100644
--- a/.github/workflows/test-upload-local.yml
+++ b/.github/workflows/test-upload-local.yml
@@ -80,26 +80,6 @@ jobs:
           fi
           
 
-      - name: Save images to cache
-        run: |
-          # Save images for future use
-          docker save mongo:4.4.15 > mongo.tar
-          docker save openneuropet/ezbids-api:latest > api.tar
-          docker save openneuropet/ezbids-handler:latest > handler.tar
-          docker save openneuropet/ezbids-ui:latest > ui.tar
-
-      - name: Cache Docker images
-        uses: actions/cache@v4
-        with:
-          path: |
-            mongo.tar
-            api.tar
-            handler.tar
-            ui.tar
-          key: test-local-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
-          restore-keys: |
-            test-local-docker-images-
-
       - name: Start services
         run: |
           # Create and set permissions for temp directory
diff --git a/.github/workflows/test-upload-nginx.yml b/.github/workflows/test-upload-nginx.yml
index 9d479d0a..ae0404b6 100644
--- a/.github/workflows/test-upload-nginx.yml
+++ b/.github/workflows/test-upload-nginx.yml
@@ -107,29 +107,6 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-
-      - name: Save nginx images to cache
-        run: |
-          # Save nginx-specific images for future use
-          docker save mongo:4.4.15 > mongo.tar
-          docker save openneuropet/ezbids-api:latest > api.tar
-          docker save openneuropet/ezbids-handler:latest > handler.tar
-          docker save openneuropet/ezbids-ui-nginx:latest > ui-nginx.tar
-          docker save nginx:latest > nginx.tar
-
-      - name: Cache Docker images
-        uses: actions/cache@v4
-        with:
-          path: |
-            mongo.tar
-            api.tar
-            handler.tar
-            ui-nginx.tar
-            nginx.tar
-          key: test-nginx-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
-          restore-keys: |
-            test-nginx-docker-images-
-
       - name: Do additional Nginx setup
         run: |
           # create self signed certs using the hostname

From b8eb1b7c7663f91f6bc16d8e2d63bbcf439a6221 Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 17:03:44 -0400
Subject: [PATCH 5/6] whoops, added tag to container name

---
 docker-compose-nginx.yml | 12 ++++++------
 docker-compose.yml       | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker-compose-nginx.yml b/docker-compose-nginx.yml
index c090e97a..15af50c6 100644
--- a/docker-compose-nginx.yml
+++ b/docker-compose-nginx.yml
@@ -3,7 +3,7 @@ networks:
 
 services:
     mongodb:
-        container_name: openneuropet/ezbids-mongodb
+        container_name: ezbids-mongodb
         image: mongo:4.4.15
         platform: linux/amd64
         volumes:
@@ -18,7 +18,7 @@ services:
             - ezbids
 
     api:
-        container_name: openneuropet/ezbids-api
+        container_name: ezbids-api
         image: openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
         build: 
             context: .
@@ -43,7 +43,7 @@ services:
             - ezbids
 
     handler:
-        container_name: openneuropet/ezbids-handler
+        container_name: ezbids-handler
         image: openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
         build:
             context: .
@@ -70,7 +70,7 @@ services:
     ui:
         # we only run this container to build the UI pages to mount into a volume
         # for use in the nginx container.
-        container_name: openneuropet/ezbids-ui-builder
+        container_name: ezbids-ui-builder
         image: openneuropet/ezbids-ui-nginx:${EZBIDS_VERSION:-latest}
         build: 
             context: ./ui/
@@ -89,7 +89,7 @@ services:
 
     # by default this is not enabled, add COMPOSE_PROFILES=telemetry to your .env
     telemetry:
-        container_name: openneuropet/ezbids-telemetry
+        container_name: ezbids-telemetry
         build: 
             context: ./telemetry
             tags: 
@@ -103,7 +103,7 @@ services:
             - ezbids
 
     nginx:
-        container_name: openneuropet/ezbids-nginx
+        container_name: ezbids-nginx
         depends_on:
             - ui
             - api
diff --git a/docker-compose.yml b/docker-compose.yml
index 98ad3c35..5ede08e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
     mongodb:
-        container_name: openneuropet/ezbids-mongodb
+        container_name: ezbids-mongodb
         image: mongo:4.4.15
         platform: linux/amd64
         volumes:
@@ -21,7 +21,7 @@ services:
             - ezbids
 
     api:
-        container_name: openneuropet/ezbids-api
+        container_name: ezbids-api
         image: openneuropet/ezbids-api:${EZBIDS_VERSION:-latest}
         build: 
             context: .
@@ -52,7 +52,7 @@ services:
             - ezbids
 
     handler:
-        container_name: openneuropet/ezbids-handler
+        container_name: ezbids-handler
         image: openneuropet/ezbids-handler:${EZBIDS_VERSION:-latest}
         build:
             context: .
@@ -77,7 +77,7 @@ services:
         command: pm2 start handler.js --attach --watch --ignore-watch "ui **/node_modules **__pycache__**"
 
     ui:
-        container_name: openneuropet/ezbids-ui
+        container_name: ezbids-ui
         image: openneuropet/ezbids-ui:${EZBIDS_VERSION:-latest}
         build: 
             context: ./ui
@@ -105,7 +105,7 @@ services:
 
     # by default this is not enabled, need to run docker compose with --profile development to enable this service
     telemetry:
-        container_name: openneuropet/ezbids-telemetry
+        container_name: ezbids-telemetry
         build: ./telemetry
         platform: linux/amd64
         depends_on:

From ad9aae4051d9734981cc6a917b211b3212ea299c Mon Sep 17 00:00:00 2001
From: Anthony Galassi <28850131+bendhouseart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 17:21:01 -0400
Subject: [PATCH 6/6] so close

---
 .github/workflows/docker-build-everything-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-everything-image.yaml b/.github/workflows/docker-build-everything-image.yaml
index ac7bf965..5c38955a 100644
--- a/.github/workflows/docker-build-everything-image.yaml
+++ b/.github/workflows/docker-build-everything-image.yaml
@@ -68,7 +68,7 @@ jobs:
 
       - name: Start Services
         run: |
-          docker run -d -p 27017:27017 -p 8082:8082 -p 3000:3000 -p 8000:8000 -v /tmp/ezbids-workdir:/tmp ezbids-everything       
+          docker run -d -p 27017:27017 -p 8082:8082 -p 3000:3000 -p 8000:8000 -v /tmp/ezbids-workdir:/tmp openneuropet/ezbids-everything
       - name: Install uv
         run: |
           curl -LsSf https://astral.sh/uv/install.sh | sh