diff --git a/Dockerfile.php8 b/Dockerfile.php8
index e3d20f586c..4fe3f982cb 100755
--- a/Dockerfile.php8
+++ b/Dockerfile.php8
@@ -12,12 +12,13 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM php:8.0-rc-cli as step1
+FROM php:8.0-rc as step1
 
 ENV TZ=Asia/Tel_Aviv \
     DEBIAN_FRONTEND=noninteractive \
     PHP_REDIS_VERSION=5.3.0 \
-    PHP_SWOOLE_VERSION=master
+    PHP_SWOOLE_VERSION=4.5.2 \
+    PHP_XDEBUG_VERSION=sdebug_2_9-beta
 
 RUN \
   apt-get update && \
@@ -37,12 +38,29 @@ RUN \
   ## Swoole Extension
   git clone https://github.com/swoole/swoole-src.git && \
   cd swoole-src && \
-  # git checkout v$PHP_SWOOLE_VERSION && \
+  git checkout v$PHP_SWOOLE_VERSION && \
   phpize && \
   ./configure --enable-sockets --enable-http2 && \
-  make && make install
+  make && make install && \
+  cd ..
+  ## XDebug Extension
+  # git clone https://github.com/swoole/sdebug.git && \
+  # cd sdebug && \
+  # git checkout $PHP_XDEBUG_VERSION && \
+  # phpize && \
+  # ./configure --enable-xdebug && \
+  # make clean && make && make install
+  # cd .. && \
+  # Meminfo Extension
+  # git clone https://github.com/BitOne/php-meminfo.git && \
+  # cd php-meminfo && \
+  # git checkout v1.0.5 && \
+  # cd extension/php7 && \
+  # phpize && \
+  # ./configure --enable-meminfo && \
+  # make && make install
 
-FROM php:8.0-rc-cli as final
+FROM php:8.0-rc as final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -84,19 +102,20 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN \
   apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests webp certbot \
-  libonig-dev libcurl4-gnutls-dev libmagickwand-dev libyaml-dev libz-dev libbrotli-dev
-  #pecl install imagick yaml && \ 
-  #docker-php-ext-enable imagick yaml
+  apt-get install -y --no-install-recommends --no-install-suggests webp certbot htop procps \
+  libonig-dev libcurl4-gnutls-dev libmagickwand-dev libyaml-dev libbrotli-dev libz-dev && \
+  pecl install imagick yaml && \ 
+  docker-php-ext-enable imagick yaml
 
-RUN docker-php-ext-install sockets curl opcache pdo pdo_mysql imagick
+RUN docker-php-ext-install sockets curl opcache pdo pdo_mysql
 
 WORKDIR /usr/src/code
 
 COPY --from=step0 /usr/local/src/vendor /usr/src/code/vendor
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190128/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20190128/
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190128/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20190128/
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190128/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20190128/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
+# COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
+# COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/meminfo.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
 
 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -110,16 +129,25 @@ RUN mkdir -p /storage/uploads && \
     mkdir -p /storage/cache && \
     mkdir -p /storage/config && \
     mkdir -p /storage/certificates && \
+    mkdir -p /storage/debug && \
     chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads && \
     chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache && \
     chown -Rf www-data.www-data /storage/config && chmod -Rf 0755 /storage/config && \
-    chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates
+    chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates && \
+    chown -Rf www-data.www-data /storage/debug && chmod -Rf 0755 /storage/debug
 
 # Executables
-RUN chmod +x /usr/local/bin/start
 RUN chmod +x /usr/local/bin/doctor
 RUN chmod +x /usr/local/bin/migrate
+RUN chmod +x /usr/local/bin/schedule
 RUN chmod +x /usr/local/bin/test
+RUN chmod +x /usr/local/bin/worker-audits
+RUN chmod +x /usr/local/bin/worker-certificates
+RUN chmod +x /usr/local/bin/worker-deletes
+RUN chmod +x /usr/local/bin/worker-mails
+RUN chmod +x /usr/local/bin/worker-tasks
+RUN chmod +x /usr/local/bin/worker-usage
+RUN chmod +x /usr/local/bin/worker-webhooks
 
 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
@@ -127,7 +155,21 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 # Enable Extensions
 RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
 RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
+# RUN echo zend_extension=xdebug.so >> /usr/local/etc/php/conf.d/xdebug.ini
+# RUN echo extension=meminfo.so >> /usr/local/etc/php/conf.d/meminfo.ini
+
+RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.enable_cli = 1" >> /usr/local/etc/php/conf.d/appwrite.ini
+# RUN echo "xdebug.profiler_enable = 1" >> /usr/local/etc/php/conf.d/appwrite.ini
+# RUN echo "xdebug.profiler_output_dir = /tmp/" >> /usr/local/etc/php/conf.d/appwrite.ini
+# RUN echo "xdebug.profiler_enable_trigger = 1" >> /usr/local/etc/php/conf.d/appwrite.ini
+# RUN echo "xdebug.trace_format = 1" >> /usr/local/etc/php/conf.d/appwrite.ini
 
 EXPOSE 80
 
-CMD [ "php" , "app/server.php" ]
\ No newline at end of file
+#, "-dxdebug.auto_trace=1"
+#, "-dxdebug.profiler_enable=1"
+#, "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php"
+
+CMD [ "php", "app/server.php", "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php" ]
\ No newline at end of file
diff --git a/Dockerfile.swoole b/Dockerfile.swoole
index 34293731d5..ee3804e13f 100755
--- a/Dockerfile.swoole
+++ b/Dockerfile.swoole
@@ -137,11 +137,10 @@ RUN mkdir -p /storage/uploads && \
     chown -Rf www-data.www-data /storage/debug && chmod -Rf 0755 /storage/debug
 
 # Executables
-RUN chmod +x /usr/local/bin/start
 RUN chmod +x /usr/local/bin/doctor
 RUN chmod +x /usr/local/bin/migrate
-RUN chmod +x /usr/local/bin/test
 RUN chmod +x /usr/local/bin/schedule
+RUN chmod +x /usr/local/bin/test
 RUN chmod +x /usr/local/bin/worker-audits
 RUN chmod +x /usr/local/bin/worker-certificates
 RUN chmod +x /usr/local/bin/worker-deletes