diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index 892a085..9493099 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         app:
-          - name: tiles-updater
+          - name: maps-tile-uploader
     env:
       OUTPUTS_DIR: /tmp/outputs
 
diff --git a/build/docker/Dockerfile.tiles-updater b/build/docker/Dockerfile.maps-tile-uploader
similarity index 83%
rename from build/docker/Dockerfile.tiles-updater
rename to build/docker/Dockerfile.maps-tile-uploader
index 7bf5324..cf908c2 100644
--- a/build/docker/Dockerfile.tiles-updater
+++ b/build/docker/Dockerfile.maps-tile-uploader
@@ -27,8 +27,8 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} \
     go build \
         -v \
         -ldflags="-w -s" \
-        -o "/home/go/tiles-updater" \
-        "./cmd/tiles-updater"
+        -o "/home/go/maps-tile-uploader" \
+        "./cmd/maps-tile-uploader"
 
 # Force distroless base to use current platform (most likely linux/amd64)
 # which is needed since distroless/static is not available for linux/arm/v6
@@ -36,7 +36,7 @@ FROM --platform=$BUILDPLATFORM gcr.io/distroless/static AS distroless
 
 FROM scratch
 COPY --from=distroless / /
-COPY --from=build /home/go/tiles-updater /usr/sbin/tiles-updater
+COPY --from=build /home/go/maps-tile-uploader /usr/sbin/maps-tile-uploader
 USER nonroot:nonroot
 EXPOSE 8080
-ENTRYPOINT [ "/usr/sbin/tiles-updater" ]
+ENTRYPOINT [ "/usr/sbin/maps-tile-uploader" ]
diff --git a/cmd/tiles-updater/defaultConfig.yaml b/cmd/maps-tile-uploader/defaultConfig.yaml
similarity index 100%
rename from cmd/tiles-updater/defaultConfig.yaml
rename to cmd/maps-tile-uploader/defaultConfig.yaml
diff --git a/cmd/tiles-updater/main.go b/cmd/maps-tile-uploader/main.go
similarity index 100%
rename from cmd/tiles-updater/main.go
rename to cmd/maps-tile-uploader/main.go
diff --git a/helm/osm-machinery/values.yaml b/helm/osm-machinery/values.yaml
index 4d9184f..c113e13 100644
--- a/helm/osm-machinery/values.yaml
+++ b/helm/osm-machinery/values.yaml
@@ -106,7 +106,7 @@ cinodeUpload:
 
   image:
     registry: ghcr.io
-    repository: cinode/tiles-updater
+    repository: cinode/maps-tile-uploader
     tag: "0.0.9"
 
   securityContext:
diff --git a/toolbox/release-chart-version.sh b/toolbox/release-chart-version.sh
index 44c9a99..45b9d88 100755
--- a/toolbox/release-chart-version.sh
+++ b/toolbox/release-chart-version.sh
@@ -40,9 +40,12 @@ else
     sed -i "s/^version: .*/version: $new_version/" "$CHART_FILE"
 fi
 
-# Update tile-uploader image tag in values.yaml
-# Match the tag line under cinodeUpload.image section
-sed -i "/^[[:space:]]*repository\:[[:space:]]*cinode\/tiles-updater/{n;s/^\([[:space:]]*\)tag: .*/\1tag: \"$new_version\"/}" "$VALUES_FILE"
+for image in \
+    maps-tile-uploader \
+; do
+    # Update tile-uploader image tags in values.yaml
+    sed -i "/^[[:space:]]*repository\:[[:space:]]*cinode\/${image}/{n;s/^\([[:space:]]*\)tag: .*/\1tag: \"$new_version\"/}" "$VALUES_FILE"
+done
 
 # Commit the version bump with GPG signature (but don't push)
 git add "$CHART_FILE" "$VALUES_FILE"