diff --git a/.drone.yml b/.drone.yml
index d55aa00..49b636c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,3 +34,14 @@ steps:
     dockerfile: phpcs/Dockerfile
     repo: evolix/phpcs
     tags: latest
+
+- name: build apache2-php
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: apache2-php/stretch/Dockerfile
+    repo: evolix/apache2-php
+    tags: stretch
diff --git a/apache2-php/Dockerfile b/apache2-php/stretch/Dockerfile
similarity index 62%
rename from apache2-php/Dockerfile
rename to apache2-php/stretch/Dockerfile
index b6078cc..cd91dbf 100644
--- a/apache2-php/Dockerfile
+++ b/apache2-php/stretch/Dockerfile
@@ -8,15 +8,31 @@ RUN apt-get update \
         php7.0 \
         php7.0-cli \
         php7.0-curl \
+        php7.0-gd \
         php7.0-imagick \
+        php7.0-imap \
+        php7.0-intl \
+        php7.0-ldap \
         php7.0-mcrypt \
         php7.0-mysql \
         php7.0-mbstring \
+        php7.0-ssh2 \
         php7.0-xml \
+        php7.0-zip \
+        composer \
         ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
+COPY apache-evolinux-defaults.conf /etc/apache2/conf-available
+COPY 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/stretch/apache-evolinux-defaults.conf b/apache2-php/stretch/apache-evolinux-defaults.conf
new file mode 100644
index 0000000..6a2b3b8
--- /dev/null
+++ b/apache2-php/stretch/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/stretch/php-evolinux-defaults.ini b/apache2-php/stretch/php-evolinux-defaults.ini
new file mode 100644
index 0000000..468cc69
--- /dev/null
+++ b/apache2-php/stretch/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