diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index ec48927..56dbb7e 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -8,6 +8,10 @@ on:
   workflow_call:
   workflow_dispatch:
 
+env:
+  PLATFORMS: ${{ vars.PLATFORMS }}
+  DOCKER_IMAGE: ghcr.io/${{ github.repository_owner }}/${{ github.repository_name }}
+
 jobs:
   docker-build:
     name: Build Swarm Load Balancer
@@ -23,7 +27,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          target: bouncer
+          target: loadbalancer
           build-args: |
             GIT_SHA=${{ github.sha }}
             GIT_BUILD_ID=${{ github.ref_name }}
@@ -33,8 +37,8 @@ jobs:
           pull: true
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
-            ${{ vars.LOADBALANCER_DOCKER_IMAGE }}:latest
-            ${{ vars.LOADBALANCER_DOCKER_IMAGE }}:built-at-${{ env.ATOM }}
-            ${{ vars.LOADBALANCER_DOCKER_IMAGE }}:sha-${{ github.sha }}
+            ${{ env.DOCKER_IMAGE }}:latest
+            ${{ env.DOCKER_IMAGE }}:date-${{ env.DATE }}
+            ${{ env.DOCKER_IMAGE }}:sha-${{ github.sha }}
           cache-from: ${{ env.DOCKER_CACHE_FROM }}
           cache-to: ${{ env.DOCKER_CACHE_TO }}
diff --git a/.github/workflows/docker.clean.yml b/.github/workflows/docker.clean.yml
index d31c9f1..b46911d 100644
--- a/.github/workflows/docker.clean.yml
+++ b/.github/workflows/docker.clean.yml
@@ -36,9 +36,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           organization: ${{ github.repository_owner }}
-          container: bouncer
+          container: ${{ github.repository_name }}
           dry-run: true
-          keep-younger-than: 30 # days
+          keep-younger-than: 90 # days
           keep-last: 2
           prune-untagged: true
           keep-tags-regexes: |
diff --git a/Dockerfile b/Dockerfile
index 7d74f5a..6c12593 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # checkov:skip=CKV_DOCKER_3 I don't have time for rootless
-FROM ghcr.io/benzine-framework/php:cli-8.2 AS bouncer
+FROM ghcr.io/benzine-framework/php:cli-8.2 AS loadbalancer
 
 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
       org.label-schema.vcs-url="https://github.com/benzine-framework/docker-swarm-loadbalancer" \