diff --git a/apache2/Dockerfile b/apache2/Dockerfile
index 569ba9f3..97636ed9 100644
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@@ -6,11 +6,11 @@ ARG PHP_SOCKET=php-fpm:9000
 
 ENV WEB_PHP_SOCKET=$PHP_SOCKET
 
-ENV WEB_DOCUMENT_ROOT=/var/www/public
+ENV WEB_DOCUMENT_ROOT=/var/www/
 
 EXPOSE 80 443
 
-WORKDIR /var/www/public
+WORKDIR /var/www/
 
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
diff --git a/docker-compose.yml b/docker-compose.yml
index d4cf71b9..e9254784 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     applications:
         image: tianon/true
         volumes:
-          - ${APPLICATIONS_HOST_DIR}:/var/www
+          - ${APPLICATIONS_HOST_DIR}:/var/www     
 
 ### Workspace Utilities Container ###########################
 
@@ -57,8 +57,9 @@ services:
                 - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
                 - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
                 - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
-                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
-                - CODEIGNITER=${PHP_FPM_CODEIGNITER}
+                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}                
+                - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
+                - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
             dockerfile: ${PHP_FPM_DOCKER_FILE}
         volumes_from:
             - applications
diff --git a/env-example b/env-example
index 6c608125..3ecca97a 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=false
+PHP_FPM_INSTALL_MYSQLI=false
+PHP_FPM_INSTALL_TOKENIZER=false
 
 # NGINX
 NGINX_HOST_HTTP_PORT=8080
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index 4b4989ab..6c63d72d 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -145,13 +145,20 @@ 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 \  
+     docker-php-ext-install mysqli \
+;fi
+
+#####################################
+# Tokenizer Modifications:
+#####################################
+
+ARG INSTALL_TOKENIZER=false
+RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
      docker-php-ext-install tokenizer \
 ;fi
 
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 20aaf5a9..d0ddaf09 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -176,13 +176,19 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
 COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 #####################################
-# Codeigniter Modifications:
+# Mysqli Modifications:
+#####################################
+ARG INSTALL_MYSQLI=false
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \    
+     docker-php-ext-install mysqli \
+;fi
+
+#####################################
+# Tokenizer Modifications:
 #####################################
 
-ARG CODEIGNITER=false
-RUN if [ ${CODEIGNITER} = true ]; then \
-    # Install Codeigniter PHP extentions requirements
-     docker-php-ext-install mysqli && \
+ARG INSTALL_TOKENIZER=false
+RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
      docker-php-ext-install tokenizer \
 ;fi