diff --git a/README.md b/README.md
index e43e115..5820137 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,11 @@ Supported tags and respective `Dockerfile` links
 - `7.x-fpm-x.x-alpine`, `latest-alpine` ([Dockerfile](php/Dockerfile-fpm))
 - `7.x-fpm-x.x-alpine-nginx`, `latest-alpine-nginx` ([Dockerfile](nginx/Dockerfile-fpm-alpine-nginx))
 
-*`latest` images are currently built based on the `release/4.x` branch*
+### Branches
+
+- *`release/4.x` (PHP 7.2) branch builds also `latest` images*
+- *`release/5.x` branch is deprecated*
+- *`release/6.x` (PHP 7.3) branch uses supervisor instead of forego*
 
 :information_source: See repository tags for full version numbers
 
diff --git a/nginx/image-files/etc/nginx/conf.d/default.conf b/nginx/image-files/etc/nginx/conf.d/default.conf
index cb424bc..fc2827e 100644
--- a/nginx/image-files/etc/nginx/conf.d/default.conf
+++ b/nginx/image-files/etc/nginx/conf.d/default.conf
@@ -10,7 +10,7 @@ server {
     ssl_certificate_key /etc/nginx/ssl/nginx-selfsigned.key;
 
     root        /app/web;
-    index       index.php;
+    index       index.php index.html index.htm;
 
     location / {
         # Redirect everything that isn't a real file to index.php
@@ -42,4 +42,4 @@ server {
     location ~ /\.(ht|svn|git) {
         deny all;
     }
-}
\ No newline at end of file
+}
diff --git a/php/Dockerfile-fpm b/php/Dockerfile-fpm
index f730f11..7e223f1 100755
--- a/php/Dockerfile-fpm
+++ b/php/Dockerfile-fpm
@@ -2,7 +2,7 @@
 # ==============================================
 
 ARG PHP_BASE_IMAGE_VERSION
-FROM php:${PHP_BASE_IMAGE_VERSION}-fpm
+FROM php:${PHP_BASE_IMAGE_VERSION}-fpm-stretch
 
 # Install system packages for PHP extensions recommended for Yii 2.0 Framework
 ENV DEBIAN_FRONTEND=noninteractive
@@ -10,7 +10,6 @@ RUN apt-get update && \
     apt-get -y install \
         gnupg2 && \
     curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
-    apt-key update && \
     apt-get update && \
     apt-get -y install \
             g++ \
@@ -29,13 +28,15 @@ RUN apt-get update && \
             libmcrypt-dev \
             libpq-dev \
             libpng-dev \
+            libzip-dev \
             zlib1g-dev \
-            mysql-client \
+            default-mysql-client \
             openssh-client \
             libxml2-dev \
             nano \
             linkchecker \
             nodejs \
+            npm \
         --no-install-recommends && \
         apt-get clean && \
         npm -g install npm@latest && \
@@ -64,7 +65,7 @@ RUN docker-php-ext-configure gd \
 # Install PECL extensions
 # see http://stackoverflow.com/a/8154466/291573) for usage of `printf`
 RUN printf "\n" | pecl install \
-        apcu-5.1.3 \
+        apcu \
         imagick \
         mcrypt-1.0.0 && \
     docker-php-ext-enable \
@@ -75,7 +76,7 @@ RUN printf "\n" | pecl install \
 RUN cd /tmp && \
     git clone git://github.com/xdebug/xdebug.git && \
     cd xdebug && \
-    git checkout 52adff7539109db592d07d3f6c325f6ee2a7669f && \
+    git checkout 2.7.2 && \
     phpize && \
     ./configure --enable-xdebug && \
     make && \