diff --git a/.github/workflows/dev-base-image.yml b/.github/workflows/dev-base-image.yml
index 5937dc3c6..df7d73305 100644
--- a/.github/workflows/dev-base-image.yml
+++ b/.github/workflows/dev-base-image.yml
@@ -29,13 +29,22 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: ${{ github.event.inputs.ref || 'master' }}
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Docker Login
       uses: docker/login-action@v1.10.0
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
-    - name: Push
-      run: docker push ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v6
+      with:
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
diff --git a/Dockerfile b/Dockerfile
index f481f58fa..47cacd0c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,9 @@ RUN openssl req -nodes -new -subj "/C=GB/ST=North Yorkshire/L=York/O=University
 
 RUN a2enmod rewrite ssl
 
+# Fixes for running on ARM
+RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf
+
 COPY sample_configs/apache.conf /etc/apache2/sites-available/myradio.conf
 RUN a2dissite 000-default && a2ensite myradio && \
     service apache2 restart && apachectl -S
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 3508d9739..d92439232 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -9,13 +9,6 @@ RUN docker-php-ext-install pgsql pdo_pgsql gd ldap curl xsl zip
 RUN pecl install memcached && \
     echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini
 
-RUN pecl install xdebug-3.3.1 && docker-php-ext-enable xdebug \
- && echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so"' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
- && echo 'xdebug.client_port=9003' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
- && echo 'xdebug.mode=develop,debug' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
- && echo 'xdebug.start_with_request=yes' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
- && echo 'xdebug.client_host=localhost' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-
 RUN echo 'error_reporting=E_ALL' >> /usr/local/etc/php/conf.d/error-reporting.ini
 
 RUN echo "memory_limit=512M" >> /usr/local/etc/php/conf.d/uploads.ini
@@ -40,7 +33,8 @@ RUN a2dissite 000-default && a2ensite myradio && \
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN mkdir -p /var/www/myradio && chown -R www-data:www-data /var/www/myradio && \
-    mkdir -p /var/log/myradio && chown -R www-data:www-data /var/log/myradio
+    mkdir -p /var/log/myradio && chown -R www-data:www-data /var/log/myradio && \
+    ln -s /var/log/myradio/errors.log /dev/stderr
 
 WORKDIR /var/www/myradio
 COPY composer.* /var/www/myradio/