diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 776d538..327129a 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -53,8 +53,7 @@ jobs:
           context: .
           push: true
           build-args: |
-              APP_IMAGE_TAG_CODE=hetzner-code
-              APP_IMAGE_TAG_BASE=hetzner-base
+              OCELOT_VERSION=hetzner
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile
index 28f922e..e152205 100644
--- a/docker/backend.Dockerfile
+++ b/docker/backend.Dockerfile
@@ -1,7 +1,6 @@
-ARG APP_IMAGE_TAG_BASE=latest-base
-ARG APP_IMAGE_TAG_CODE=latest-code
+ARG OCELOT_VERSION=master
 
-FROM ghcr.io/ocelot-social-community/ocelot-social/backend:${APP_IMAGE_TAG_CODE} AS build
+FROM ghcr.io/ocelot-social-community/ocelot-social/backend:${OCELOT_VERSION}-code AS build
 
-FROM ghcr.io/ocelot-social-community/ocelot-social/backend:${APP_IMAGE_TAG_BASE} AS branded
+FROM ghcr.io/ocelot-social-community/ocelot-social/backend:${OCELOT_VERSION}-base AS branded
 COPY --from=build /build .
diff --git a/docker/maintenance.Dockerfile b/docker/maintenance.Dockerfile
index 5d846be..32ae532 100644
--- a/docker/maintenance.Dockerfile
+++ b/docker/maintenance.Dockerfile
@@ -1,6 +1,6 @@
-ARG APP_IMAGE_TAG_CODE=latest-code
+ARG OCELOT_VERSION=master
 
-FROM ghcr.io/ocelot-social-community/ocelot-social/maintenance:${APP_IMAGE_TAG_CODE} as build
+FROM ghcr.io/ocelot-social-community/ocelot-social/maintenance:${OCELOT_VERSION}-code AS build
 
 FROM nginx:alpine AS branded
 COPY --from=build ./app/dist/ /usr/share/nginx/html/
diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile
index e7b0f19..e4abd38 100644
--- a/docker/webapp.Dockerfile
+++ b/docker/webapp.Dockerfile
@@ -1,7 +1,6 @@
-ARG APP_IMAGE_TAG_BASE=latest-base
-ARG APP_IMAGE_TAG_CODE=latest-code
+ARG OCELOT_VERSION=master
 
-FROM ghcr.io/ocelot-social-community/ocelot-social/webapp:${APP_IMAGE_TAG_CODE} AS build
+FROM ghcr.io/ocelot-social-community/ocelot-social/webapp:${OCELOT_VERSION}-code AS build
 
-FROM ghcr.io/ocelot-social-community/ocelot-social/webapp:${APP_IMAGE_TAG_BASE} AS branded
+FROM ghcr.io/ocelot-social-community/ocelot-social/webapp:${OCELOT_VERSION}-base AS branded
 COPY --from=build /build .