diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 21da122..408c60c 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -66,6 +66,19 @@ jobs:
         push: true
         tags: unixfox/invidious-custom:new-latest, unixfox/invidious-custom:new-build-${{ env.commitid }}
 
+    - name: Build and push alpine docker image with API only
+      id: docker_build_new
+      uses: docker/build-push-action@v2
+      with:
+        context: ./
+        file: ./Dockerfile.new
+        build-args: |
+            release=1
+            add_build_args=-Dapi_only
+        platforms: linux/amd64,linux/arm64/v8
+        push: true
+        tags: unixfox/invidious-custom:api-new-latest, unixfox/invidious-custom:api-new-build-${{ env.commitid }}
+
     - name: Build and push official crystal docker image
       id: docker_build
       uses: docker/build-push-action@v2
diff --git a/Dockerfile.new b/Dockerfile.new
index ed62649..87b5f3d 100644
--- a/Dockerfile.new
+++ b/Dockerfile.new
@@ -15,9 +15,16 @@ COPY ./invidious/src/ ./src/
 # TODO: .git folder is required for building – this is destructive.
 # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
 COPY ./invidious/.git/ ./.git/
-RUN crystal build --release ./src/invidious.cr \
-    --static --warnings all \
-    --link-flags "-lxml2 -llzma"
+RUN if [ ${release} == 1 ] ; then \
+        crystal build ./src/invidious.cr ${add_build_args} \
+        --release \
+        --static --warnings all \
+        --link-flags "-lxml2 -llzma"; \
+    else \
+        crystal build ./src/invidious.cr ${add_build_args} \
+        --static --warnings all \
+        --link-flags "-lxml2 -llzma"; \
+    fi
 RUN shards build --release --static sentry_crash_handler
 
 FROM alpine:edge