diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index d1ea0b71..3ab1f21c 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: 
+on:
   push:
     branches: '**'
     tags: '**'
@@ -32,7 +32,6 @@ jobs:
         sed -i -- 's/PHALCON=true/PHALCON=false/g' .env
         sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
         sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
-        sed -i -- 's/YAML=true/YAML=false/g' .env
         sed -i -- 's/MSSQL=true/MSSQL=false/g' .env
         sed -i -- 's/AMQP=true/AMQP=false/g' .env
         sed -i -- 's/MEMCACHED=true/MEMCACHED=false/g' .env
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 06fbcdf6..88784a92 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -840,11 +840,13 @@ ARG INSTALL_YAML=false
 RUN if [ ${INSTALL_YAML} = true ]; then \
     apt-get install libyaml-dev -y ; \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-        pecl install -a yaml-1.3.2; \
-    else \
-        pecl install yaml; \
-    fi && \
-    docker-php-ext-enable yaml \
+        echo '' | pecl install -a yaml-1.3.2; \
+    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+        echo '' | pecl install yaml-2.0.4; \
+    else
+        echo '' | pecl install yaml; \
+    fi \
+    && docker-php-ext-enable yaml; \
 ;fi
 
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 534e4c7a..4cbcf78f 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1388,12 +1388,14 @@ ARG INSTALL_YAML=false
 RUN if [ ${INSTALL_YAML} = true ]; then \
     apt-get install libyaml-dev -y ; \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-        pecl install -a yaml-1.3.2; \
-    else \
-        pecl install yaml; \
-    fi && \
-    echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini && \
-    ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \
+        echo '' | pecl install -a yaml-1.3.2; \
+    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+        echo '' | pecl install yaml-2.0.4; \
+    else
+        echo '' | pecl install yaml; \
+    fi \
+    && echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini \
+    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini; \
 ;fi
 
 ###########################################################################
@@ -1632,8 +1634,6 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
 	  echo "" >> ~/.zshrc \
 ;fi
 
-USER root
-
 #
 #--------------------------------------------------------------------------
 # Final Touch