diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index 6de5b81..8c0a0c7 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - .github/:/configs
 
   env:
-    image: "ghcr.io/sandialabs/fenix/env"
+    image: "sandialabs/fenix/env"
     build:
       # Generated by running the bootstrap image
       dockerfile: .github/spack.Dockerfile
diff --git a/.github/workflows/ci_checks.yaml b/.github/workflows/ci_checks.yaml
index 0f9cdb7..6537363 100644
--- a/.github/workflows/ci_checks.yaml
+++ b/.github/workflows/ci_checks.yaml
@@ -49,14 +49,14 @@ jobs:
         uses: docker/bake-action@v5
         with:
           files: .github/docker-compose.yml
-          targets: ghcr.io/sandialabs/fenix/env
+          targets: sandialabs/fenix/env
           workdir: .
           pull: true
           push: true
           set: |
             *.cache-from=type=gha,scope=local/env/${{ matrix.ompi_version }}
             *.cache-to=type=gha,mode=max,scope=local/env/${{ matrix.ompi_version }}
-            *.tags=ghcr.io/sandialabs/fenix/env:${{ matrix.ompi_version }}
+            *.output=type=docker,name=ghcr.io/sandialabs/fenix/env:${{ matrix.ompi_version }}
 
       - name: Build Fenix
         uses: docker/bake-action@v5