diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6b075da..db2cd8a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,6 +1,9 @@
 name: ⎈ Release Version
 
 on:
+  pull_request:
+    branches:
+      - main
   push:
     tags:
       - v**
@@ -17,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛎️ Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: 📦 Cargo version
         id: cargo
@@ -60,7 +63,12 @@ jobs:
       - name: 🏷 Get tag
         id: tag
         run: |
-          echo "tag=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+          if [ "${{ github.event_name }}" -eq "push" ]
+          then
+            echo "tag=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+          else
+            echo "tag=ci-${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: 🐳 Login to DockerHub
         uses: docker/login-action@v3
@@ -81,8 +89,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          build-args: BASE_IMAGE=platzio/base:v6
-          push: true
+          build-args: BASE_IMAGE=platzio/base:v7
+          push: ${{ github.event_name == 'push' }}
           platforms: linux/amd64,linux/arm64
           tags: ${{ env.DOCKER_REPO }}:${{ steps.tag.outputs.tag }}
           cache-from: type=gha
@@ -90,6 +98,7 @@ jobs:
 
   release:
     name: 🚀 Create Release
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     needs:
       - image
diff --git a/Dockerfile b/Dockerfile
index 5a4a5b2..27c423f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,21 @@
 ARG BASE_IMAGE
 
-FROM --platform=$BUILDPLATFORM rust:1 AS build
+FROM rust:1-trixie AS builder
+RUN apt-get update && \
+    apt-get install -y \
+        musl \
+        musl-dev \
+        musl-tools
+
+FROM builder AS build
 ARG RELEASE_BUILD=1
-ARG TARGETARCH
 WORKDIR /build
 RUN mkdir -p /build/outputs
 COPY . /build
 RUN --mount=type=cache,id=platz-backend-cargo-target,target=/build/target,sharing=locked \
     --mount=type=cache,id=platz-backend-cargo-git,target=/usr/local/cargo/git,sharing=locked \
     --mount=type=cache,id=platz-backend-cargo-registry,target=/usr/local/cargo/registry,sharing=locked \
-    ./scripts/container-build.sh "${TARGETARCH}" "${RELEASE_BUILD}" "/build/outputs"
+    ./scripts/container-build.sh "${RELEASE_BUILD}" "/build/outputs"
 
 FROM $BASE_IMAGE
 WORKDIR /root/
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c790a05..068c7d8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   db:
-    image: postgres:15
+    image: postgres:17-alpine
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       args:
-        BASE_IMAGE: platzio/base:v6
+        BASE_IMAGE: platzio/base:v7
         RELEASE_BUILD: 0
     command:
       - /root/platz-api
diff --git a/scripts/container-build.sh b/scripts/container-build.sh
index 99699a1..1a0e6f7 100755
--- a/scripts/container-build.sh
+++ b/scripts/container-build.sh
@@ -1,51 +1,11 @@
 #!/usr/bin/env bash
 
-set -eu
-set -o pipefail
+set -euo pipefail
 
-TARGETARCH="$1"
-RELEASE_BUILD="$2"
-BUILD_DEST="$3"
-
-case "$TARGETARCH" in \
-    arm64)
-        LINUX_TARGETARCH="aarch64"
-        ;;
-    amd64)
-        LINUX_TARGETARCH="x86_64"
-        ;;
-    *)
-        echo "Unknown arch $TARGETARCH"
-        exit 1
-    ;;
-esac
-
-dpkg --add-architecture "${TARGETARCH}"
-
-if [ "${LINUX_TARGETARCH}" != `uname -m` ]
-then
-    apt-get install -y "gcc-`echo ${LINUX_TARGETARCH} | tr '_' '-'`-linux-gnu"
-fi
-
-cat >"${CARGO_HOME}/config.toml" <<EOF
-[target.x86_64-unknown-linux-gnu]
-linker = "x86_64-linux-gnu-gcc"
-
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
-EOF
-
-export CC_x86_64_unknown_linux_gnu="x86_64-linux-gnu-gcc"
-export CXX_x86_64_unknown_linux_gnu="x86_64-linux-gnu-g++"
-export AR_x86_64_unknown_linux_gnu="x86_64-linux-gnu-ar"
-
-export CC_aarch64_unknown_linux_gnu="aarch64-linux-gnu-gcc"
-export CXX_aarch64_unknown_linux_gnu="aarch64-linux-gnu-g++"
-export AR_aarch64_unknown_linux_gnu="aarch64-linux-gnu-ar"
-
-export LDFLAGS="-L/usr/lib/${LINUX_TARGETARCH}-linux-gnu"
-export CARGO_BUILD_TARGET="${LINUX_TARGETARCH}-unknown-linux-gnu"
+RELEASE_BUILD="$1"
+BUILD_DEST="$2"
 
+export CARGO_BUILD_TARGET="$(arch)-unknown-linux-musl"
 rustup target add "${CARGO_BUILD_TARGET}"
 
 if [ "${RELEASE_BUILD}" = "1" ]
@@ -58,5 +18,4 @@ else
 fi
 
 cargo build ${CARGO_FLAGS}
-
 find "${CARGO_TARGET_DIR}" -maxdepth 1 -type f -executable -exec cp -v {} "${BUILD_DEST}/" \;