diff --git a/.drone.yml b/.drone.yml
index 49b636c..e4ed843 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,7 +35,7 @@ steps:
     repo: evolix/phpcs
     tags: latest
 
-- name: build apache2-php
+- name: build apache2-php (Stretch)
   image: plugins/docker
   settings:
     username:
@@ -45,3 +45,16 @@ steps:
     dockerfile: apache2-php/stretch/Dockerfile
     repo: evolix/apache2-php
     tags: stretch
+
+- name: build apache2-php (Buster)
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: apache2-php/stretch/Dockerfile
+    repo: evolix/apache2-php
+    tags:
+      - buster
+      - latest
diff --git a/apache2-php/buster/Dockerfile b/apache2-php/buster/Dockerfile
new file mode 100644
index 0000000..b1280e4
--- /dev/null
+++ b/apache2-php/buster/Dockerfile
@@ -0,0 +1,38 @@
+# Official Debian image
+FROM debian:buster
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apache2 \
+        libapache2-mod-php7.3 \
+        php7.3 \
+        php7.3-cli \
+        php7.3-curl \
+        php7.3-gd \
+        php7.3-imagick \
+        php7.3-imap \
+        php7.3-intl \
+        php7.3-ldap \
+        php7.3-mcrypt \
+        php7.3-mysql \
+        php7.3-mbstring \
+        php7.3-ssh2 \
+        php7.3-xml \
+        php7.3-zip \
+        composer \
+        ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY apache2-php/stretch/apache-evolinux-defaults.conf /etc/apache2/conf-available
+COPY apache2-php/stretch/php-evolinux-defaults.ini /etc/php/7.0/apache2/conf.d
+
+RUN a2enconf apache-evolinux-defaults
+RUN a2enmod rewrite remoteip headers
+
+RUN echo "export APACHE_ARGUMENTS='-DFOREGROUND'" >>/etc/apache2/envvars
+
+EXPOSE 80
+
+VOLUME /var/www/
+
+CMD ["apache2ctl", "-k", "start"]
diff --git a/apache2-php/buster/apache-evolinux-defaults.conf b/apache2-php/buster/apache-evolinux-defaults.conf
new file mode 100644
index 0000000..6a2b3b8
--- /dev/null
+++ b/apache2-php/buster/apache-evolinux-defaults.conf
@@ -0,0 +1,36 @@
+ServerTokens Prod
+Timeout 10
+KeepAliveTimeout 2
+MaxKeepAliveRequests 10
+#MaxClients 250
+MaxRequestWorkers 250
+ServerLimit 250
+StartServers 50
+MinSpareServers 20
+MaxSpareServers 30
+MaxRequestsPerChild 0
+
+<Directory /home/>
+    AllowOverride None
+    Require all granted
+</Directory>
+
+<IfModule mod_ssl.c>
+    SSLProtocol all -SSLv2 -SSLv3
+    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4
+</IfModule>
+<Files ~ "\.(inc|bak)$">
+    Require all denied
+</Files>
+
+<IfModule mod_status.c>
+    ExtendedStatus On
+    <IfModule mod_proxy.c>
+        ProxyStatus On
+    </IfModule>
+</IfModule>
+
+<IfModule mpm_itk.c>
+    LimitUIDRange       0 6000
+    LimitGIDRange       0 6000
+</IfModule>
diff --git a/apache2-php/buster/php-evolinux-defaults.ini b/apache2-php/buster/php-evolinux-defaults.ini
new file mode 100644
index 0000000..468cc69
--- /dev/null
+++ b/apache2-php/buster/php-evolinux-defaults.ini
@@ -0,0 +1,10 @@
+[PHP]
+
+short_open_tag = Off
+expose_php = Off
+display_errors = Off
+log_errors = On
+html_errors = Off
+allow_url_fopen = Off
+opcache.memory_consumption = 128M
+opcache.max_accelerated_files = 8000