diff --git a/.docker/Dockerfile b/.docker/Dockerfile
new file mode 100644
index 0000000..a2c4703
--- /dev/null
+++ b/.docker/Dockerfile
@@ -0,0 +1,19 @@
+FROM composer AS composer
+FROM php:8.2-apache
+
+COPY .. /var/www/html/
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY .docker/hosts/abiball.conf /etc/apache2/sites-enabled
+
+RUN chown -R www-data:www-data /var/www/html
+RUN rm /etc/apache2/sites-enabled/000-default.conf
+
+RUN apt-get update
+RUN apt-get install -qq -y --no-install-recommends libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev
+
+RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl mbstring zip gd xsl
+RUN a2enmod rewrite
+RUN pecl install apcu && docker-php-ext-enable apcu
+
+WORKDIR /var/www/html
+RUN composer install --optimize-autoloader --no-suggest --no-progress
\ No newline at end of file
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 2afd8f4..7273c9a 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
           password: ${{ vars.DOCKER_PW }}
 
       - name: build
-        run: docker build -t git.simonis.lol/sites/abiball:latest .
+        run: docker buildx build -f .docker/Dockerfile -t git.simonis.lol/sites/abiball:latest .
 
       - name: push
         run: docker push git.simonis.lol/sites/abiball:latest
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index ae205c5..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM php:8.2-apache
-
-COPY . /var/www/html/
-
-RUN chown -R www-data:www-data /var/www/html
-
-RUN rm /etc/apache2/sites-enabled/000-default.conf
-COPY .docker/hosts/abiball.conf /etc/apache2/sites-enabled
-
-RUN apt-get update \
-    && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev;
-
-RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
-
-RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \
-   mv composer.phar /usr/local/bin/composer
-
-RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite
-RUN pecl install apcu && docker-php-ext-enable apcu
-
-WORKDIR /var/www/html
-RUN composer install --optimize-autoloader --no-suggest --no-progress
\ No newline at end of file