diff --git a/Dockerfile b/Dockerfile
index d082d9c81f..e146008222 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -107,9 +107,11 @@ FROM base AS development
 COPY ./docs /usr/src/code/docs
 COPY ./dev /usr/src/code/dev
 
-RUN cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \
+RUN if [ "$DEBUG" = "true" ]; then \
+    cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \
     mkdir -p /tmp/xdebug && \
-    apk add --update --no-cache openssh-client github-cli
+    apk add --update --no-cache openssh-client github-cli; \
+    fi
 
 EXPOSE 80
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f246dbb456..87b45d7e4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,7 @@ services:
     image: appwrite-dev
     build:
       context: .
+      target: development
       args:
         DEBUG: false
         TESTING: true