diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 9589150..0f3c7cd 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -10,9 +10,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
     zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install Xdebug
-RUN yes | pecl install xdebug \
-  && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini
+# Xdebug
+RUN pecl install xdebug \
+  && docker-php-ext-enable xdebug
 
  # Install Composer.
 RUN curl -sS https://getcomposer.org/installer | php -- \
@@ -27,6 +27,9 @@ RUN mkdir /usr/local/src/wellrested && \
   chown -R www-data:www-data /usr/local/src/wellrested && \
   chown -R www-data:www-data /var/www
 
+# Copy XDebug config file
+COPY ./docker/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
 # Copy entrypoint script
 COPY docker/php/entrypoint /usr/local/bin
 
@@ -41,4 +44,4 @@ CMD ["php-fpm"]
 
 WORKDIR /usr/local/src/wellrested
 
-USER www-data
\ No newline at end of file
+USER www-data