diff --git a/docker/dev/mtt-php82-angie-postgres10/.env b/docker/dev/mtt-php82-angie-postgres10/.env
new file mode 100644
index 0000000..ca7b6fa
--- /dev/null
+++ b/docker/dev/mtt-php82-angie-postgres10/.env
@@ -0,0 +1 @@
+PLATFORM_NAME=mtt-dev-php82-angie-postgres10
diff --git a/docker/dev/mtt-php82-angie-postgres10/compose.yml b/docker/dev/mtt-php82-angie-postgres10/compose.yml
new file mode 100644
index 0000000..15c0695
--- /dev/null
+++ b/docker/dev/mtt-php82-angie-postgres10/compose.yml
@@ -0,0 +1,58 @@
+version: "3.9"
+
+networks:
+  network:
+    name: "${PLATFORM_NAME}-network"
+
+services:
+  web:
+    build:
+      context: ../_nginx
+      dockerfile: Dockerfile-angie-alpine
+    image: mtt-dev/angie:alpine
+    container_name: ${PLATFORM_NAME}-web
+    ports:
+      - "8080:80"
+    volumes:
+      - ../../../src:/var/www/html
+    depends_on:
+      - fpm
+    networks:
+      - network
+
+  fpm:
+    build:
+      context: ../mtt-php82-angie
+      dockerfile: Dockerfile-fpm
+    image: mtt-dev/php:8.2-fpm-alpine
+    container_name: ${PLATFORM_NAME}-fpm
+    environment:
+      - MTT_ENABLE_DEBUG=YES
+      - MTT_DB_TYPE=postgres
+      - MTT_API_USE_PATH_INFO=YES
+      - MTT_DB_HOST=db
+      - MTT_DB_NAME=mtt
+      - MTT_DB_USER=mtt
+      - MTT_DB_PASSWORD=mtt
+      - MTT_DB_PREFIX=mtt_
+    volumes:
+      - ../../../src:/var/www/html
+      - ../../../tests:/var/www/tests
+      - ../mtt-php82-angie/php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
+      - ../mtt-php82-angie/php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini
+    networks:
+      - network
+
+  db:
+    # do not use alpine image due to missing locales
+    image: postgres:10.0
+    container_name: ${PLATFORM_NAME}-db
+    userns_mode: keep-id
+    environment:
+      POSTGRES_PASSWORD: mtt
+      POSTGRES_USER: mtt
+      POSTGRES_DB: mtt
+    volumes:
+      - ../_postgres10/db_data:/var/lib/postgresql/data
+    networks:
+      - network
diff --git a/docker/dev/mtt-php82-angie/Dockerfile-fpm b/docker/dev/mtt-php82-angie/Dockerfile-fpm
new file mode 100644
index 0000000..b68c07d
--- /dev/null
+++ b/docker/dev/mtt-php82-angie/Dockerfile-fpm
@@ -0,0 +1,25 @@
+FROM php:8.2-fpm-alpine
+
+RUN  apk add --update-cache libpq postgresql-dev icu icu-dev && \
+  docker-php-ext-install pdo_mysql pdo_pgsql intl && \
+  apk del postgresql-dev icu-dev && rm -rf /var/cache/apk/* && \
+  mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+  mkdir /var/www/phpinfo && \
+  echo "<?php phpinfo();" > /var/www/phpinfo/phpinfo.php && \
+  curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-10.phar" && \
+  chmod +x /usr/local/bin/phpunit && \
+  ln -s html /var/www/src
+
+# RUN docker-php-ext-install pdo_mysql && \
+#   mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+#   mkdir /var/www/phpinfo && \
+#   echo "<?php phpinfo();" > /var/www/phpinfo/phpinfo.php && \
+#   curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-10.phar" && \
+#   chmod +x /usr/local/bin/phpunit && \
+#   ln -s html /var/www/src
+
+COPY php-mtt.ini      /usr/local/etc/php/conf.d/
+COPY php-opcache.ini  /usr/local/etc/php/conf.d/
+COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf
+
+VOLUME /var/www/html
diff --git a/docker/dev/mtt-php82-angie/compose.yml b/docker/dev/mtt-php82-angie/compose.yml
index a389e34..81a135f 100644
--- a/docker/dev/mtt-php82-angie/compose.yml
+++ b/docker/dev/mtt-php82-angie/compose.yml
@@ -22,7 +22,7 @@ services:
 
   fpm:
     build:
-      context: ../mtt-php82-nginx
+      context: .
       dockerfile: Dockerfile-fpm
     image: mtt-dev/php:8.2-fpm-alpine
     container_name: ${PLATFORM_NAME}-fpm
@@ -33,7 +33,8 @@ services:
     volumes:
       - ../../../src:/var/www/html
       - ../../../tests:/var/www/tests
-      - ../mtt-php82-nginx/php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
-      - ../mtt-php82-nginx/php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini
+      - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
+      - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini
+
     networks:
       - network
diff --git a/docker/dev/mtt-php82-nginx/php-fpm-www.conf b/docker/dev/mtt-php82-angie/php-fpm-www.conf
similarity index 100%
rename from docker/dev/mtt-php82-nginx/php-fpm-www.conf
rename to docker/dev/mtt-php82-angie/php-fpm-www.conf
diff --git a/docker/dev/mtt-php82-nginx/php-mtt.ini b/docker/dev/mtt-php82-angie/php-mtt.ini
similarity index 90%
rename from docker/dev/mtt-php82-nginx/php-mtt.ini
rename to docker/dev/mtt-php82-angie/php-mtt.ini
index f9b6186..4ab4103 100644
--- a/docker/dev/mtt-php82-nginx/php-mtt.ini
+++ b/docker/dev/mtt-php82-angie/php-mtt.ini
@@ -8,3 +8,5 @@ display_startup_errors = On
 
 cgi.fix_pathinfo=0
 session.gc_divisor = 100
+
+allow_url_fopen=1
diff --git a/docker/dev/mtt-php82-nginx/php-opcache.ini b/docker/dev/mtt-php82-angie/php-opcache.ini
similarity index 100%
rename from docker/dev/mtt-php82-nginx/php-opcache.ini
rename to docker/dev/mtt-php82-angie/php-opcache.ini
diff --git a/docker/dev/mtt-php82-apache/Dockerfile-web b/docker/dev/mtt-php82-apache/Dockerfile-web
index f23d10d..be632ba 100644
--- a/docker/dev/mtt-php82-apache/Dockerfile-web
+++ b/docker/dev/mtt-php82-apache/Dockerfile-web
@@ -1,6 +1,8 @@
-FROM php:8.2-apache
+FROM php:8.2-apache-buster
 
-RUN docker-php-ext-install mysqli && \
+RUN apt-get update && apt-get install -y libicu-dev && \
+  docker-php-ext-install mysqli intl && \
+  apt-get -y autoremove && \
   mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
   mkdir /var/www/phpinfo && \
   a2enmod rewrite && \
diff --git a/docker/dev/mtt-php82-apache/compose.yml b/docker/dev/mtt-php82-apache/compose.yml
index 58da7c9..15f51f9 100644
--- a/docker/dev/mtt-php82-apache/compose.yml
+++ b/docker/dev/mtt-php82-apache/compose.yml
@@ -14,5 +14,6 @@ services:
       - MTT_DB_TYPE=sqlite
     volumes:
       - ../../../src:/var/www/html
+      - ../../../tests:/var/www/tests
       - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
       - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini
diff --git a/docker/dev/mtt-php82-nginx/.env b/docker/dev/mtt-php82-nginx/.env
deleted file mode 100644
index aa353f2..0000000
--- a/docker/dev/mtt-php82-nginx/.env
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORM_NAME=mtt-dev-php82-nginx-alpine
diff --git a/docker/dev/mtt-php82-nginx/Dockerfile-fpm b/docker/dev/mtt-php82-nginx/Dockerfile-fpm
deleted file mode 100644
index 29e5f3c..0000000
--- a/docker/dev/mtt-php82-nginx/Dockerfile-fpm
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM php:8.2-fpm-alpine
-
-RUN docker-php-ext-install pdo_mysql && \
-  mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
-  mkdir /var/www/phpinfo && \
-  echo "<?php phpinfo();" > /var/www/phpinfo/phpinfo.php && \
-  curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-10.phar" && \
-  chmod +x /usr/local/bin/phpunit && \
-  ln -s html /var/www/src
-
-#COPY php-mtt.ini      /usr/local/etc/php/conf.d/
-#COPY php-opcache.ini  /usr/local/etc/php/conf.d/
-COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf
-
-VOLUME /var/www/html
diff --git a/docker/dev/mtt-php82-nginx/compose.yml b/docker/dev/mtt-php82-nginx/compose.yml
deleted file mode 100644
index d810205..0000000
--- a/docker/dev/mtt-php82-nginx/compose.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-version: "3.9"
-
-networks:
-  network:
-    name: "${PLATFORM_NAME}-network"
-
-services:
-  web:
-    build:
-      context: ../_nginx
-      dockerfile: Dockerfile-nginx-alpine
-    image: mtt-dev/nginx:alpine
-    container_name: ${PLATFORM_NAME}-web
-    ports:
-      - "8080:80"
-    volumes:
-      - ../../../src:/var/www/html
-    depends_on:
-      - fpm
-    networks:
-      - network
-
-  fpm:
-    build:
-      context: .
-      dockerfile: Dockerfile-fpm
-    image: mtt-dev/php:8.2-fpm-alpine
-    container_name: ${PLATFORM_NAME}-fpm
-    environment:
-      - MTT_ENABLE_DEBUG=YES
-      - MTT_DB_TYPE=sqlite
-      - MTT_API_USE_PATH_INFO=YES
-    volumes:
-      - ../../../src:/var/www/html
-      - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
-      - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini
-    networks:
-      - network