diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index d0208f2..3c9528c 100755
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -19,6 +19,12 @@ services:
       service: php-fpm
     build:
       dockerfile: php81.Dockerfile
+  php82:
+    extends:
+      file: docker-compose.base.yml
+      service: php-fpm
+    build:
+      dockerfile: php82.Dockerfile
   workspace74:
     extends:
       file: docker-compose.base.yml
@@ -31,3 +37,9 @@ services:
       service: workspace
     build:
       dockerfile: workspace81.Dockerfile
+  workspace82:
+    extends:
+      file: docker-compose.base.yml
+      service: workspace
+    build:
+      dockerfile: workspace82.Dockerfile
diff --git a/src/dockerfiles/php-fpm/php.base.Dockerfile b/src/dockerfiles/php-fpm/php.base.Dockerfile
index 78a5aa6..af93856 100644
--- a/src/dockerfiles/php-fpm/php.base.Dockerfile
+++ b/src/dockerfiles/php-fpm/php.base.Dockerfile
@@ -21,7 +21,13 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
     pecl install xdebug-2.5.5; \
   elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
-    pecl install xdebug-3.1.6; \
+    if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
+        pecl install xdebug-3.1.6; \
+    elif [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \
+        pecl install xdebug-3.3.1; \
+    else \
+        pecl install xdebug; \
+    fi \
   else \
     pecl install xdebug-2.9.8; \
   fi && \
diff --git a/src/dockerfiles/php-fpm/php82.Dockerfile b/src/dockerfiles/php-fpm/php82.Dockerfile
new file mode 100644
index 0000000..ce927d5
--- /dev/null
+++ b/src/dockerfiles/php-fpm/php82.Dockerfile
@@ -0,0 +1,7 @@
+# syntax = edrevo/dockerfile-plus
+FROM php:8.2-fpm
+
+INCLUDE+ ./php.base.Dockerfile
+
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
+    && docker-php-ext-install -j$(nproc) gd
diff --git a/src/dockerfiles/workspace/workspace.base.Dockerfile b/src/dockerfiles/workspace/workspace.base.Dockerfile
index feb345b..d404d3f 100644
--- a/src/dockerfiles/workspace/workspace.base.Dockerfile
+++ b/src/dockerfiles/workspace/workspace.base.Dockerfile
@@ -158,7 +158,13 @@ RUN if [ ${INSTALL_S3_MINIO_CLIENT} = true ]; then \
 RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
       pecl install xdebug-2.5.5; \
     elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
-      pecl install xdebug-3.1.6; \
+      if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
+          pecl install xdebug-3.1.6; \
+      elif [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \
+          pecl install xdebug-3.3.1; \
+      else \
+          pecl install xdebug; \
+      fi \
     else \
       pecl install xdebug-2.9.8; \
     fi && \
diff --git a/src/dockerfiles/workspace/workspace82.Dockerfile b/src/dockerfiles/workspace/workspace82.Dockerfile
new file mode 100644
index 0000000..d263978
--- /dev/null
+++ b/src/dockerfiles/workspace/workspace82.Dockerfile
@@ -0,0 +1,9 @@
+# syntax = edrevo/dockerfile-plus
+FROM laradock/workspace:latest-8.2
+
+ARG PHP_VERSION=8.2
+ENV PHP_VERSION ${PHP_VERSION}
+
+INCLUDE+ ./workspace.base.Dockerfile
+INCLUDE+ ./composer.Dockerfile
+INCLUDE+ ./xdebug3.Dockerfile