diff --git a/.github/workflows/callable-build-docker-image.yml b/.github/workflows/callable-build-docker-image.yml
index 148727d..2bb81c0 100644
--- a/.github/workflows/callable-build-docker-image.yml
+++ b/.github/workflows/callable-build-docker-image.yml
@@ -8,6 +8,10 @@ on:
       DOCKERFILE_PATH:
         required: true
         type: string
+      PLATFORMS:
+        required: true
+        type: string
+        default: linux/amd64
 
 jobs:
   build-docker-image:
@@ -24,6 +28,11 @@ jobs:
         uses: ./.github/actions/prepare-env-variables/
         id: prepare-build-env-variables
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ inputs.PLATFORMS }}
+
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v3
 
@@ -43,7 +52,7 @@ jobs:
       - name: Build image and push to registry - ${{ inputs.DOCKER_REGISTRY_IMAGE }}
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64
+          platforms: ${{ inputs.PLATFORMS }}
           context: .
           file: ${{ inputs.DOCKERFILE_PATH }}
           cache-from: type=registry,ref=${{ inputs.DOCKER_REGISTRY_IMAGE }}
diff --git a/.github/workflows/merge-build-production-docker-images.yml b/.github/workflows/merge-build-production-docker-images.yml
index 950eb5b..782d6bb 100644
--- a/.github/workflows/merge-build-production-docker-images.yml
+++ b/.github/workflows/merge-build-production-docker-images.yml
@@ -33,6 +33,7 @@ jobs:
         beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
         beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
       DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
+      PLATFORMS: linux/amd64,linux/arm64
     secrets: inherit
 
   update-docker-hub-repo-description:
diff --git a/.github/workflows/pr-build-test-docker-image.yml b/.github/workflows/pr-build-test-docker-image.yml
index 0a02b69..cc0b2e3 100644
--- a/.github/workflows/pr-build-test-docker-image.yml
+++ b/.github/workflows/pr-build-test-docker-image.yml
@@ -44,4 +44,5 @@ jobs:
     with:
       DOCKER_REGISTRY_IMAGE: ghcr.io/beeyev/thumbor-s3:${{ matrix.baseDist }}-test
       DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
+      PLATFORMS: linux/amd64
     secrets: inherit
diff --git a/README.md b/README.md
index baaf61a..1101364 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # [Thumbor S3 Docker](https://github.com/beeyev/thumbor-s3-docker)  
-> A docker image for Thumbor with AWS S3 / Minio integration for cropping, resizing, applying filters and optimizing images on the fly.
+> A Docker image for Thumbor with AWS S3 and Minio integration, designed for on-the-fly image cropping, resizing, applying filters, and image optimization.
 
 <p align="center"><a href="https://github.com/beeyev/thumbor-s3-docker"><img src="https://github.com/beeyev/thumbor-s3-docker/raw/master/docs/img/thumbor-s3-docker.jpg"></a></p>
 
 ## A little of introduction
-Thumbor S3 Docker is available in two variants of docker images, lightweight (slim) - `slim-alpine` and full-featured  - `alpine`.
+Thumbor S3 Docker is available in two variants of docker images, a lightweight (slim) - `slim-alpine` and a full-featured  - `alpine`.
 
 ### All current docker images are packed with these features:
  - AWS S3 / Minio integration support
diff --git a/examples/read-from-S3-cache-to-S3/README.md b/examples/read-from-S3-cache-to-S3/README.md
index 49cc978..74caf15 100644
--- a/examples/read-from-S3-cache-to-S3/README.md
+++ b/examples/read-from-S3-cache-to-S3/README.md
@@ -1,7 +1,7 @@
 # Read-from-S3-cache-to-S3
 ### Use S3 storage as a source for images and another S3 storage to store cached results
 
-1. Take a look at [`docker-compose.yml`](docker-compose.yml) example file, copy it to your machine.
+1. Take a look at [`docker-compose.yml`](docker-compose.yml) example file, copy it to your local machine.
 2. Run command `docker-compose up --build --no-deps --detach --remove-orphans` to spin up the containers.
 3. Check that Thumbor container has started correctly by opening this url in your browser: http://localhost:8888/healthcheck  
 
diff --git a/examples/read-from-S3-cache-to-S3/docker-compose.yml b/examples/read-from-S3-cache-to-S3/docker-compose.yml
index 0b22f78..b1460f0 100644
--- a/examples/read-from-S3-cache-to-S3/docker-compose.yml
+++ b/examples/read-from-S3-cache-to-S3/docker-compose.yml
@@ -2,7 +2,7 @@
 
 services:
   thumbor:
-    image: beeyev/thumbor-s3:7.6-slim-alpine
+    image: ghcr.io/beeyev/thumbor-s3:slim-alpine-test
     restart: unless-stopped
     tty: true
     ports: