diff --git a/README.md b/README.md
index 6d25169..68129ce 100644
--- a/README.md
+++ b/README.md
@@ -114,17 +114,17 @@ docker compose --profile fluidd --profile klipperscreen up -d
 ```
 
 ## Updating
-Images are built daily and tagged with nightly and the first seven chars of the commit-sha of the remote repo. 
+Images are built daily and tagged with latest and the first seven chars of the commit-sha of the remote repo. 
 Example: 
 
-* ``mkuf/klipper:nightly``
+* ``mkuf/klipper:latest``
 * ``mkuf/klipper:a33d069``
 
-The ``Nightly`` Tag will point to a new Image within 24h.  
+The ``latest`` Tag will point to a new Image within 24h.  
 The SHA-Tag ``a33d069`` will remain and refers to [Klipper3d/klipper:a33d069](https://github.com/Klipper3d/klipper/commit/a33d0697b6438e362f0cf9d25e1e8358d331bf53)
 
 Updating can be handled via docker-compose.  
-docker-compose.yaml uses nightly tags for all Images contained in this Repository.  
+docker-compose.yaml uses latest tags for all Images contained in this Repository.  
 Compose will download all current Images and replace them when starting the stack again. 
 ```
 docker compose pull
diff --git a/docker-compose.mcu.yaml b/docker-compose.mcu.yaml
index dc36854..16b18d4 100644
--- a/docker-compose.mcu.yaml
+++ b/docker-compose.mcu.yaml
@@ -1,6 +1,6 @@
 services:
   make:
-    image: mkuf/klipper:${TAG:-nightly}-mcu
+    image: mkuf/klipper:${TAG:-latest}-mcu
     tty: true
     privileged: true
     entrypoint: make
diff --git a/docker-compose.override.yaml b/docker-compose.override.yaml
index 5195b57..d03a886 100644
--- a/docker-compose.override.yaml
+++ b/docker-compose.override.yaml
@@ -1,6 +1,6 @@
 ## Ustreamer base Service
 x-ustreamer-svc: &ustreamer-svc
-  image: mkuf/ustreamer:nightly
+  image: mkuf/ustreamer:latest
   restart: unless-stopped
   command:
     - "--host=0.0.0.0"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cfd3c37..7f6da9e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,6 @@
 ## Common Templates
 x-klipper-svc: &klipper-svc
-  image: mkuf/klipper:nightly
+  image: mkuf/klipper:latest
   container_name: klipper
   restart: unless-stopped
   logging:
@@ -49,7 +49,7 @@ services:
   ## WebApi
   ##
   moonraker:
-    image: mkuf/moonraker:nightly
+    image: mkuf/moonraker:latest
     container_name: moonraker
     restart: unless-stopped
     pid: host
@@ -121,7 +121,7 @@ services:
       - "traefik.http.routers.fluidd.entrypoints=web"
 
   mainsail:
-    image: mkuf/mainsail:nightly
+    image: mkuf/mainsail:latest
     container_name: mainsail
     restart: unless-stopped
     profiles:
@@ -133,7 +133,7 @@ services:
       - "traefik.http.routers.mainsail.entrypoints=web"
 
   klipperscreen:
-    image: mkuf/klipperscreen:nightly
+    image: mkuf/klipperscreen:latest
     container_name: klipperscreen
     restart: unless-stopped
     network_mode: host
diff --git a/scripts/build-images.sh b/scripts/build-images.sh
index 6f23a76..a150f07 100755
--- a/scripts/build-images.sh
+++ b/scripts/build-images.sh
@@ -33,16 +33,17 @@ for target in $(grep "FROM .* as" ${dockerfile} | sed -r 's/.*FROM.*as (.*)/\1/g
     tag_extra="-${target}"
   fi
 
-  ## Nightly
+  ## latest
   if docker manifest inspect ${registry}${app}:${shortref}${tag_extra} > /dev/null; then
     log "## Image ${registry}${app}:${shortref}${tag_extra} already exists, nothing to do."
   else
-    log "## Building nightly Image ${registry}${app}:${shortref}${tag_extra}"
+    log "## Building latest Image ${registry}${app}:${shortref}${tag_extra}"
     docker buildx build \
       --build-arg VERSION=${ref} \
       --platform ${platform} \
       --tag ${registry}${app}:${shortref}${tag_extra} \
       --tag ${registry}${app}:nightly${tag_extra} \
+      --tag ${registry}${app}:latest${tag_extra} \
       --target ${target} \
       --push \
       ${context}