diff --git a/.docker/.htaccess8 b/.docker/.htaccess8
deleted file mode 100755
index f10b4dad8..000000000
--- a/.docker/.htaccess8
+++ /dev/null
@@ -1,75 +0,0 @@
-# ~~start~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again
-# .htaccess automaticaly generated by PrestaShop e-commerce open-source solution
-# https://www.prestashop.com - https://www.prestashop.com/forums
-
-<IfModule mod_rewrite.c>
-<IfModule mod_env.c>
-SetEnv HTTP_MOD_REWRITE On
-</IfModule>
-
-RewriteEngine on
-
-
-#Domain: demoshop8.ngrok.io
-RewriteRule . - [E=REWRITEBASE:/]
-RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
-RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L]
-
-# Images
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$1$3 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$1$4 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$4/$1$5 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$4/$5/$1$6 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])([\d])([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$4/$5/$6/$1$7 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])([\d])([\d])([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$4/$5/$6/$7/$1$8 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^(([\d])([\d])([\d])([\d])([\d])([\d])([\d])(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/$2/$3/$4/$5/$6/$7/$8/$1$9 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^c/([\d]+)(\-[\.*\w-]*)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]
-RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
-RewriteRule ^c/([a-zA-Z_-]+)(-[\d]+)?/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]
-# AlphaImageLoader for IE and fancybox
-RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ %{ENV:REWRITEBASE}js/jquery/plugins/fancybox/images/$1.$2 [L]
-
-# Dispatcher
-RewriteCond %{REQUEST_FILENAME} -s [OR]
-RewriteCond %{REQUEST_FILENAME} -l [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^.*$ - [NC,L]
-RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L]
-</IfModule>
-
-AddType application/vnd.ms-fontobject .eot
-AddType font/ttf .ttf
-AddType font/otf .otf
-AddType application/font-woff .woff
-AddType font/woff2 .woff2
-<IfModule mod_headers.c>
-	<FilesMatch "\.(ttf|ttc|otf|eot|woff|woff2|svg)$">
-		Header set Access-Control-Allow-Origin "*"
-	</FilesMatch>
-</IfModule>
-
-<Files composer.lock>
-    # Apache 2.2
-    <IfModule !mod_authz_core.c>
-        Order deny,allow
-        Deny from all
-    </IfModule>
-
-    # Apache 2.4
-    <IfModule mod_authz_core.c>
-        Require all denied
-    </IfModule>
-</Files>
-#If rewrite mod isn't enabled
-ErrorDocument 404 /index.php?controller=404
-
-# ~~end~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again
-
diff --git a/.docker/Dockerfile.8 b/.docker/Dockerfile.8
index 12593bfdb..73ee2ea91 100755
--- a/.docker/Dockerfile.8
+++ b/.docker/Dockerfile.8
@@ -1,4 +1,4 @@
-FROM prestashop/prestashop:8.1.3
+FROM prestashop/prestashop:8.1.3-apache
 
 RUN cd /usr/local/etc/php/conf.d/ && \
   echo 'memory_limit = 4096M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini