diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fdcf31d0..d0c0b2ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: version
 
+    # Add concurrency check for base image
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: false
+
     steps:
+      - name: 🔍 Wait for base image workflow
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.ref }}
+          check-name: 'build-and-push'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+          allowed-conclusions: success,skipped
       - name: 🛎️ Checkout
         uses: actions/checkout@v4
 
diff --git a/Dockerfile.base b/Dockerfile.base
index 2ad867ee..a49b7977 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -6,11 +6,21 @@ RUN apk add --no-cache \
     freetype \
     freetype-dev \
     harfbuzz \
+    python3 \
+    make \
+    g++ \
     ca-certificates \
     ttf-freefont \
+    pixman-dev \
+    cairo-dev \
+    pango-dev \
+    giflib-dev \
+    libjpeg-turbo-dev \
     ghostscript \
     graphicsmagick
 
+# TODO: Remove unused native dependencies: `cairo`, `pango`, `pixman`, `giflib` and maybe others?
+
 COPY package*.json /app/
 WORKDIR /app
 RUN npm ci --omit=dev
\ No newline at end of file