diff --git a/docker-compose.yml b/docker-compose.yml
index 1730395..2bc475a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,37 +1,16 @@
 services:
-  ###
-  # Main php container
-  #
-  # This container runs the php-fpm process, optionally nginx, and serves Shopware.
-  #
-  # Requires the db container to be running.
-  #
-  # Contains:
-  #  - php-fpm, nginx, xdebug, composer
-  #  - Shopware installation (in volume web-data)
-  #  - Various tools: zsh, vim
-  #
-  ##
+  prestashop:
+    image: ghcr.io/myparcelnl/prestashop:8.0.5-php8.1
+    build:
+      context: images/prestashop
+      dockerfile: Dockerfile
+
   shopware:
     image: ghcr.io/myparcelnl/shopware
     build:
       context: images/shopware
       dockerfile: Dockerfile
 
-  ###
-  # Main php container
-  #
-  # This container runs the php-fpm process and serves WordPress.
-  #
-  # Requires the db container to be running.
-  #
-  # Contains:
-  #  - php-fpm, nginx, xdebug, composer
-  #  - WordPress installation (in volume web-data)
-  #  - Various tools: zsh, vim
-  #
-  # See https://github.com/myparcelnl/docker-images/pkgs/container/wordpress
-  ##
   wordpress:
     image: ghcr.io/myparcelnl/wordpress:6.3-php7.4
     build:
diff --git a/images/prestashop/.env.template b/images/prestashop/.env.template
index 3a86fd7..8373205 100644
--- a/images/prestashop/.env.template
+++ b/images/prestashop/.env.template
@@ -11,7 +11,7 @@ FORCE_DATABASE_UPDATE=0
 INSTALL_MODULES=1
 
 ###
-# Set to 0 if you have a separate nginx container in your setup, to 1 to include nginx in this container.
+# Set to 0 if you have a separate nginx container in your setup, to 1 to start nginx in this container.
 ###
 WITH_NGINX=0
 
@@ -58,11 +58,11 @@ PS_DB_CREATE=1
 PS_ENABLE_SSL=1
 PS_COUNTRY=NL
 PS_LANGUAGE=en
-PS_FOLDER_ADMIN=admin1
+PS_FOLDER_ADMIN=admin-dev
 
 # Admin credentials
 PS_ADMIN_MAIL=admin@${BASE_URL}
-PS_ADMIN_PASSWORD=admin
+PS_ADMIN_PASSWORD=admin123
 
 ###
 # MySQL
diff --git a/images/prestashop/Dockerfile b/images/prestashop/Dockerfile
index df9f830..5f46e4f 100644
--- a/images/prestashop/Dockerfile
+++ b/images/prestashop/Dockerfile
@@ -18,7 +18,7 @@ COPY --from=node /usr/local/bin     /usr/local/bin
 COPY --from=node /usr/local/include /usr/local/include
 COPY --from=node /usr/local/lib     /usr/local/lib
 
-ARG PS_VERSION="8.0.4"
+ARG PS_VERSION="8.0.5"
 
 ARG ROOT_DIR=/var/www/html
 
@@ -94,22 +94,19 @@ RUN PHP_VERSION="$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;")" && \
     composer clear-cache && \
     apk del git
 
-COPY ./config/php-fpm /usr/local/etc/php-fpm.d
-COPY ./config/php     /usr/local/etc/php
-COPY ./scripts/       /tmp/scripts
-COPY ./etc/nginx/http.d                   /etc/nginx/http.d
+COPY ./config/php-fpm   /usr/local/etc/php-fpm.d
+COPY ./config/php       /usr/local/etc/php
+COPY ./scripts/         /tmp/scripts
+COPY ./etc/nginx/http.d /etc/nginx/http.d
 
 ENV PS_VERSION=${PS_VERSION}
 
-ENV ROOT_DIR=${ROOT_DIR}
-
-
 ###
 # Core
 ###
 ENV BASE_URL=prestashop.dev.myparcel.nl
 ENV FULL_URL=https://${BASE_URL}
-ENV ROOT_DIR=/var/www/html
+ENV ROOT_DIR=${ROOT_DIR}
 
 ###
 # Database
@@ -132,11 +129,11 @@ ENV PS_DB_CREATE=1
 ENV PS_ENABLE_SSL=1
 ENV PS_COUNTRY=NL
 ENV PS_LANGUAGE=en
-ENV PS_FOLDER_ADMIN=admin1
+ENV PS_FOLDER_ADMIN=admin-dev
 
 # Admin credentials
 ENV PS_ADMIN_MAIL=admin@${BASE_URL}
-ENV PS_ADMIN_PASSWORD=admin
+ENV PS_ADMIN_PASSWORD=admin123!
 
 
 ###
diff --git a/images/prestashop/etc/nginx/http.d/default.conf b/images/prestashop/etc/nginx/http.d/default.conf
index dd88a2f..3b132fc 100644
--- a/images/prestashop/etc/nginx/http.d/default.conf
+++ b/images/prestashop/etc/nginx/http.d/default.conf
@@ -71,9 +71,9 @@ server {
     try_files $uri $uri/ /index.php$is_args$args;
   }
 
-  location /$admin_dir/ {
+  location /admin-dev/ {
     if (!-e $request_filename) {
-      rewrite ^ /$admin_dir/index.php last;
+      rewrite ^ /admin-dev/index.php last;
     }
   }