diff --git a/docker-compose.yml b/docker-compose.yml
index 49f598f..f9d0777 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,9 +56,10 @@ services:
                 - INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
                 - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
                 - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
-                - INSTALL_EXIF=${PHP_FPM_DOCKER_FILE}
-                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_DOCKER_FILE}
-                - CODEIGNITER=${PHP_FPM_DOCKER_FILE}
+                - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
+                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}                
+                - INSTALL_MYSQLI=${PHP_FPM_MYSQLI}
+                - INSTALL_TOKENIZER=${PHP_FPM_TOKENIZER}
             dockerfile: ${PHP_FPM_DOCKER_FILE}
         volumes_from:
             - applications
diff --git a/env-example b/env-example
index aa2a731..d95f208 100644
--- a/env-example
+++ b/env-example
@@ -51,7 +51,8 @@ PHP_FPM_INSTALL_MEMCACHED=false
 PHP_FPM_INSTALL_OPCACHE=false
 PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
-PHP_FPM_CODEIGNITER=falses
+PHP_FPM_MYSQLI=false
+PHP_FPM_TOKENIZER=false
 
 # NGINX
 NGINX_HOST_HTTP_PORT=8080
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index acd02b8..bb80842 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -142,13 +142,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
 COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 #####################################
-# Codeigniter Modifications:
+# Mysqli Modifications:
 #####################################
 
-ARG CODEIGNITER=false
-RUN if [ ${CODEIGNITER} = true ]; then \
-    # Install Codeigniter PHP extentions requirements
-     docker-php-ext-install mysqli && \
+ARG INSTALL_MYSQLI=false
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+    # Install mysqli PHP extentions requirements
+     docker-php-ext-install mysqli && \     
+;fi
+
+#####################################
+# Tokenizer Modifications:
+#####################################
+
+ARG INSTALL_TOKENIZER=false
+RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
+    # Install tokenizer PHP extentions requirements
      docker-php-ext-install tokenizer \
 ;fi
 
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 20aaf5a..c529fbb 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -176,13 +176,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
 COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 #####################################
-# Codeigniter Modifications:
+# Mysqli Modifications:
 #####################################
 
-ARG CODEIGNITER=false
-RUN if [ ${CODEIGNITER} = true ]; then \
-    # Install Codeigniter PHP extentions requirements
-     docker-php-ext-install mysqli && \
+ARG INSTALL_MYSQLI=false
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+    # Install mysqli PHP extentions requirements
+     docker-php-ext-install mysqli && \     
+;fi
+
+#####################################
+# Tokenizer Modifications:
+#####################################
+
+ARG INSTALL_TOKENIZER=false
+RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
+    # Install tokenizer PHP extentions requirements
      docker-php-ext-install tokenizer \
 ;fi