diff --git a/README.md b/README.md
index a2cadbc..20f5f86 100644
--- a/README.md
+++ b/README.md
@@ -196,4 +196,4 @@ Download:https://softwarepublico.gov.br/gitlab/sei/sei-vagrant/raw/master/parar_
     destruir_VM_Dev_Localhost_SEI.bat
 
 Como o nome diz, destroi todo o ambiente de desenvolvimento utilizado até o momento, apagando todas as informações persistidas no banco de dados. A simples execução do comando vagrant up reconstrói um novo ambiente limpo para o sistema SEI. Semelhante ao comando vagrant destroy.
-Download: https://softwarepublico.gov.br/gitlab/sei/sei-vagrant/raw/master/destruir_VM_Dev_Localhost_SEI.bat
\ No newline at end of file
+Download: https://softwarepublico.gov.br/gitlab/sei/sei-vagrant/raw/master/destruir_VM_Dev_Localhost_SEI.bat
diff --git a/Vagrantfile b/Vagrantfile
index 1e0e9c4..a7dfc5b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,21 +5,21 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  # Atribuição do hostname da máquina virtual 
+  # Atribuição do hostname da máquina virtual
   config.vm.hostname = "sei-vagrant"
   config.vm.box = "ubuntu/trusty64"
 
   # Configuração do redirecionamento entre Máquina Virtual e Host
   # Necessário permissões de root para utilizar a porta 80 (> 1024)
   config.vm.network :forwarded_port, guest: 80,   host: 80   # SIP e SEI (Apache)
-  config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
   config.vm.network :forwarded_port, guest: 1521, host: 1521 # Banco de Dados (Oracle)
+  config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
   config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
   config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
   config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
 
   # Diretórios compartilhados com a durante a execução
-  config.vm.synced_folder ".", "/mnt/sei/ops" 
+  config.vm.synced_folder ".", "/mnt/sei/ops"
   config.vm.synced_folder "../sei", "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"]
 
   # Configurações padrão da máquina virtual host
@@ -28,16 +28,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Provisionamento da máquina virtual responsável por manter os containers do Docker
-  config.vm.provision "docker" do |docker|    
-    
+  config.vm.provision "docker" do |docker|
+    #todo: Construir container fora do Vagrant e registrar no github
+    #docker.pull_images "processoeletronico/solr-6.1"
+    #docker.pull_images "processoeletronico/mysql-6.5"
+    #docker.pull_images "processoeletronico/oracle-11g"
+    #docker.pull_images "processoeletronico/fakesmtp-x.x"
+    #docker.pull_images "processoeletronico/jod-2.2.2"
+    #docker.pull_images "processoeletronico/sei-3.0.0"
+
     # Constrói imagens dos containers utilizados no provicionamento
     docker.build_image "/mnt/sei/ops/solr",      args: "-t 'processoeletronico/solr'"
     docker.build_image "/mnt/sei/ops/mysql",     args: "-t 'processoeletronico/mysql'"
     docker.build_image "/mnt/sei/ops/oracle",    args: "-t 'processoeletronico/oracle'"
     docker.build_image "/mnt/sei/ops/sei",       args: "-t 'processoeletronico/sei'"
     docker.build_image "/mnt/sei/ops/fakesmtp",  args: "-t 'processoeletronico/fakesmtp'"
-    docker.build_image "/mnt/sei/ops/jod",       args: "-t 'processoeletronico/jod'"    
-    docker.pull_images "schickling/mailcatcher" 
+    docker.build_image "/mnt/sei/ops/jod",       args: "-t 'processoeletronico/jod'"
+    docker.pull_images "schickling/mailcatcher"
     docker.pull_images "memcached"
 
     # docker run -d --name smtp -p 1080:1080 schickling/mailcatcher:latest
@@ -51,8 +58,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       args: "-p 11211:11211"
 
     # docker run -d --name mysql -p 3306:3306 processoeletronico/mysql:latest
-    docker.run "mysql",  image: "processoeletronico/mysql:latest", 
-      daemonize: true, 
+    docker.run "mysql",  image: "processoeletronico/mysql:latest",
+      daemonize: true,
       args: "-p 3306:3306"
 
     # docker run -d --name oracle -p 1521:1521 -p 8180:8080 processoeletronico/oracle:latest
@@ -62,17 +69,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     # docker run -d --name solr -p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index processoeletronico/solr:latest
     docker.run "solr", image: "processoeletronico/solr:latest",
-      daemonize: true, 
+      daemonize: true,
       args: "-p 8983:8983"
 
     # docker run -d --name jod -p 8080:8080 processoeletronico/jod:latest
     docker.run "jod", image: "processoeletronico/jod:latest",
-      daemonize: true, 
+      daemonize: true,
       args: "-p 8080:8080"
 
-    # docker run -d --name sei -p 80:80 --link solr:solr --link db:db --link memcached:memcached --link smtp:smtp -v /mnt/sei/src:/opt  processoeletronico/sei:latest
-    docker.run "sei", image: "processoeletronico/sei:latest", 
-      daemonize: true, 
+    # docker run -d --name sei -p 80:80 --link oracle:oracle --link solr:solr --link db:db --link memcached:memcached --link smtp:smtp -v /mnt/sei/src:/opt  processoeletronico/sei:latest
+    docker.run "sei", image: "processoeletronico/sei:latest",
+      daemonize: true,
       args: "-p 80:80 --link oracle:oracle --link mysql:mysql --link solr:solr --link memcached:memcached --link jod:jod --link smtp:smtp -v /mnt/sei/src:/opt"
   end
 
diff --git a/Vagrantfile_Distrib b/Vagrantfile_Distrib
index 95c5c63..de2b63a 100644
--- a/Vagrantfile_Distrib
+++ b/Vagrantfile_Distrib
@@ -1,6 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# Alerta para instalação e configuração do plugin vbguest para atualização do
+# VirtualBox Guest Additions
 unless Vagrant.has_plugin?("vagrant-vbguest")
   warn "\n\n**********************************************************\n\n"+
        "                          ATENÇAO !!!                        \n\n"+
diff --git a/fakesmtp/Dockerfile b/fakesmtp/Dockerfile
index a50774c..22d7735 100644
--- a/fakesmtp/Dockerfile
+++ b/fakesmtp/Dockerfile
@@ -1,10 +1,10 @@
-##############################################################################
-# Dockerfile de construção do container WebApp utilizado pelo SEI e pelo SIP #
-##############################################################################
-
-FROM schickling/mailcatcher
+################################################################################
+# Dockerfile de construção do container do FakeSMTP
+#
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
 
 MAINTAINER PEN - Processo Eletrônico Nacional
+FROM schickling/mailcatcher
 
 EXPOSE 1080
-
diff --git a/jod/Dockerfile b/jod/Dockerfile
index 7e50af2..10bdc1b 100644
--- a/jod/Dockerfile
+++ b/jod/Dockerfile
@@ -1,32 +1,21 @@
-###########################################################
-# Dockerfile de construção do container JOD
-# utilizado pelo SEI e pelo SIP
+################################################################################
+# Dockerfile de construção do container JOD utilizado pelo SEI e SIP
 #
-# Baseado no CentOS 6.X
-############################################################
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
 
-# Definição da imagem de base para o CentOS 6.X
-FROM centos:centos6
-
-# Autor e mantenedor do container
 MAINTAINER PEN - Processo Eletrônico Nacional
+FROM centos:centos6
 
-################## INICIO DA INSTALACAO ######################
-# Instalação do JOD Converter seguindo as recomendações descritas na documentação do SEI
+############################# INÍCIO DA INSTALACAO #############################
+ENV TERM xterm
 
 COPY install.sh /install.sh
 COPY jodconverter-tomcat-2.2.2.zip /tmp/
 COPY entrypoint.sh /entrypoint.sh
 
 RUN bash /install.sh
+############################## FIM DA INSTALACAO ###############################
 
-##################### FIM DA INSTALACAO #####################
-
-# Definição do terminal a ser utilizado
-ENV TERM xterm
-
-# Exposição da porta de conexão ao Apache
 EXPOSE 8080
-
-# Inicialização dos serviços Apache e Memcache
 CMD ["/entrypoint.sh"]
diff --git a/jod/entrypoint.sh b/jod/entrypoint.sh
index 2b3780d..b413199 100644
--- a/jod/entrypoint.sh
+++ b/jod/entrypoint.sh
@@ -1,10 +1,7 @@
-#!/usr/bin/env bash 
+#!/usr/bin/env bash
 
 SOFFICE_PATH=/usr/bin/soffice
 TOMCAT6_PATH=/opt/jodconverter-tomcat-2.2.2/bin/catalina.sh
 
-echo "Iniciando o serviço LibreOffice headless ..."
 $SOFFICE_PATH --headless --nologo --nofirststartwizard --accept="socket,host=127.0.0.1,port=8100;urp" & > /dev/null 2>&1
-
-echo "Iniciando o serviço Tomcat 6 ..."
 $TOMCAT6_PATH run
diff --git a/jod/install.sh b/jod/install.sh
index 6991df8..8cd7a9d 100644
--- a/jod/install.sh
+++ b/jod/install.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 set -e
 
 # Instalação do pacote Java JDK e utilitários utilizados no provisionamento
@@ -7,14 +6,11 @@ yum -y update
 yum install -y java-1.7.0-openjdk-devel wget unzip dos2unix libreoffice libreoffice-headless && \
 yum -y clean all
 
-
-
 # Instalação da api de serviços de conversão de documentos
-unzip /tmp/jodconverter-tomcat-2.2.2.zip -d /opt 
+unzip /tmp/jodconverter-tomcat-2.2.2.zip -d /opt
 rm /tmp/jodconverter-tomcat-2.2.2.zip
 
 # Script de inicialização do container entry-point
 chmod +x /entrypoint.sh
 
 exit 0
-
diff --git a/memcached/Dockerfile b/memcached/Dockerfile
index a891977..7a45812 100644
--- a/memcached/Dockerfile
+++ b/memcached/Dockerfile
@@ -1,12 +1,10 @@
-##############################################################################
-# Dockerfile de construção do container de cache do utilizado pelo SEI e SIP #
-##############################################################################
+################################################################################
+# Dockerfile de construção do container de cache do utilizado pelo SEI e SIP
+#
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
 
-# Definição da imagem de base para o CentOS 6.X
-FROM memcached
-
-# Autor e mantenedor do container
 MAINTAINER PEN - Processo Eletrônico Nacional
+FROM memcached
 
-# Exposição da porta de conexão ao Apache
 EXPOSE 11211
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 65e822d..571cbe1 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -1,28 +1,24 @@
-############################################################
+################################################################################
 # Dockerfile de construção do container do MySQL utilizado pelo SEI e pelo SIP
-############################################################
+#
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
 
-# Definição da imagem de base para o CentOS 6.X
-FROM centos:centos6
-
-# Autor e mantenedor do container
 MAINTAINER PEN - Processo Eletrônico Nacional
+FROM centos:centos6
 
-################## INICIO DA INSTALACAO ######################
+############################# INÍCIO DA INSTALACAO #############################
 # Instalação do MySQL seguindo as recomendações descritas na documentação do SEI
 
 ENV TERM xterm
 
-
-COPY install.sh /install.sh
 COPY sei-db-ref-executivo/mysql/sei_3_0_0_BD_Ref_Exec.sql /tmp/sei_mysql.sql
 COPY sei-db-ref-executivo/mysql/sip_3_0_0_BD_Ref_Exec.sql /tmp/sip_mysql.sql
+COPY install.sh /install.sh
 
 RUN bash /install.sh
 
-# Exposição da porta de conexão ao MySQL Server
-EXPOSE 3306
- 
-# Inicialização do serviço 
-CMD ["/usr/bin/mysqld_safe", "--bind-address=0.0.0.0"]
+############################## FIM DA INSTALACAO ###############################
 
+EXPOSE 3306
+CMD ["/entrypoint.sh"]
diff --git a/mysql/entrypoint.sh b/mysql/entrypoint.sh
new file mode 100644
index 0000000..185b093
--- /dev/null
+++ b/mysql/entrypoint.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Leberado acesso irrestrito à base para uso em desenvolvimento
+/usr/bin/mysqld_safe --bind-address=0.0.0.0
diff --git a/mysql/install.sh b/mysql/install.sh
index b085938..58a0ba4 100644
--- a/mysql/install.sh
+++ b/mysql/install.sh
@@ -1,12 +1,10 @@
 #!/usr/bin/env bash
-
 set -e
 
-yum update -y
-
-yum install -y wget
+yum -y update
 
 # Instalar o MySQL 5.6
+yum install -y wget
 wget http://repo.mysql.com/mysql-community-release-el6-5.noarch.rpm
 rpm -ivh mysql-community-release-el6-5.noarch.rpm
 yum -y install mysql-server
diff --git a/oracle/Dockerfile b/oracle/Dockerfile
index 229c6ff..2118808 100644
--- a/oracle/Dockerfile
+++ b/oracle/Dockerfile
@@ -1,13 +1,28 @@
+################################################################################
+# Dockerfile de construção do container do Oracle utilizado pelo SEI e pelo SIP
+#
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
+
+MAINTAINER PEN - Processo Eletrônico Nacional
 FROM wnameless/oracle-xe-11g
 
+############################# INÍCIO DA INSTALACAO #############################
+
 ENV ORACLE_ALLOW_REMOTE=true
-ENV NLS_LANG=PORTUGUESE_BRAZIL.WE8MSWIN1252
+ENV NLS_LANG=PORTUGUESE_BRAZIL.WE8ISO8859P1
 
-COPY install.sh /install.sh
 COPY pre-install.sql /tmp/pre-install.sql
+#todo: Necessário migrar dumps para git submodule
 COPY SEI_3.0.0.dmp /tmp/sei.dmp
 COPY SIP_3.0.0.dmp /tmp/sip.dmp
 COPY sei-config.sql /tmp/sei-config.sql
 COPY sip-config.sql /tmp/sip-config.sql
+COPY install.sh /install.sh
 
 RUN bash /install.sh
+
+############################## FIM DA INSTALACAO ###############################
+
+# Imagem de base já configura a exposição das portas 1521 e inicialização do
+# servidor de banco de dados com as configurações padrões
diff --git a/oracle/install.sh b/oracle/install.sh
index 0563dee..31e91ee 100644
--- a/oracle/install.sh
+++ b/oracle/install.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
-
 set -e
 
-# Variáveis de ambiente 
+# Variáveis de ambiente
 export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE
@@ -19,7 +18,7 @@ imp system/oracle file=/tmp/sei.dmp full=y
 imp system/oracle file=/tmp/sip.dmp full=y
 
 # Configuração das bases de dados do sistema
-sqlplus sei/sei_user @"/tmp/sei-config.sql"
-sqlplus sip/sip_user @"/tmp/sip-config.sql"
+sqlplus sei_user/sei_user @"/tmp/sei-config.sql"
+sqlplus sip_user/sip_user @"/tmp/sip-config.sql"
 
 exit 0
diff --git a/oracle/instantclient-sdk-linux.x64-11.2.0.4.0.zip b/oracle/instantclient-sdk-linux.x64-11.2.0.4.0.zip
deleted file mode 100644
index 93b80c4..0000000
Binary files a/oracle/instantclient-sdk-linux.x64-11.2.0.4.0.zip and /dev/null differ
diff --git a/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm b/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm
deleted file mode 100644
index 032ef0d..0000000
Binary files a/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm and /dev/null differ
diff --git a/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm b/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm
deleted file mode 100644
index 30aaa0b..0000000
Binary files a/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm and /dev/null differ
diff --git a/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm b/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm
deleted file mode 100644
index 5127722..0000000
Binary files a/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm and /dev/null differ
diff --git a/oracle/pre-install.sql b/oracle/pre-install.sql
index 6c4e7c2..b196e10 100644
--- a/oracle/pre-install.sql
+++ b/oracle/pre-install.sql
@@ -11,10 +11,10 @@ STARTUP;
 CREATE TABLESPACE SEI DATAFILE '/u01/app/oracle/oradata/XE/sei.dbf' SIZE 20M AUTOEXTEND ON;
 CREATE TABLESPACE SIP DATAFILE '/u01/app/oracle/oradata/XE/sip.dbf' SIZE 20M AUTOEXTEND ON;
 
-CREATE USER sei IDENTIFIED BY sei_user;
-CREATE USER sip IDENTIFIED BY sip_user;
+CREATE USER sei_user IDENTIFIED BY sei_user;
+CREATE USER sip_ser IDENTIFIED BY sip_user;
 
-GRANT ALL PRIVILEGES TO sei;
-GRANT ALL PRIVILEGES TO sip;
+GRANT ALL PRIVILEGES TO sei_user;
+GRANT ALL PRIVILEGES TO sip_user;
 
 EXIT;
diff --git a/oracle/sei-config.sql b/oracle/sei-config.sql
index c9aa6b5..e9e4eb2 100644
--- a/oracle/sei-config.sql
+++ b/oracle/sei-config.sql
@@ -2,4 +2,3 @@ update orgao set sigla='ABC', descricao='ORGAO ABC' where id_orgao=0;
 delete from auditoria_protocolo;
 
 EXIT;
-
diff --git a/oracle/sip-config.sql b/oracle/sip-config.sql
index f9dae07..d219f5b 100644
--- a/oracle/sip-config.sql
+++ b/oracle/sip-config.sql
@@ -4,4 +4,3 @@ update sistema set pagina_inicial='http://localhost/sei/inicializar.php', web_se
 update orgao set sin_autenticar='N' where id_orgao=0;
 
 EXIT;
-
diff --git a/sei/ConfiguracaoSEI.php b/sei/ConfiguracaoSEI.php
index e3ab530..8a0bf7b 100644
--- a/sei/ConfiguracaoSEI.php
+++ b/sei/ConfiguracaoSEI.php
@@ -2,90 +2,90 @@
 
 class ConfiguracaoSEI extends InfraConfiguracao  {
 
- 	private static $instance = null;
+  private static $instance = null;
 
- 	public static function getInstance(){
- 	  if (ConfiguracaoSEI::$instance == null) {
- 	    ConfiguracaoSEI::$instance = new ConfiguracaoSEI();
- 	  }
- 	  return ConfiguracaoSEI::$instance;
- 	}
+  public static function getInstance(){
+    if (ConfiguracaoSEI::$instance == null) {
+      ConfiguracaoSEI::$instance = new ConfiguracaoSEI();
+    }
 
- 	public function getArrConfiguracoes(){
- 	  return array(
+    return ConfiguracaoSEI::$instance;
+  }
 
- 	      'SEI' => array(
- 	          'URL' => 'http://localhost/sei',
- 	          'Producao' => false,
- 	          'RepositorioArquivos' => '/var/sei/arquivos'),
+  public function getArrConfiguracoes(){
+    return array(
+      'SEI' => array(
+        'URL' => 'http://localhost/sei',
+        'Producao' => false,
+        'RepositorioArquivos' => '/var/sei/arquivos'),
 
- 	      'PaginaSEI' => array(
- 	          'NomeSistema' => 'SEI',
- 	          'NomeSistemaComplemento' => SEI_VERSAO,
- 	          'LogoMenu' => ''),
- 	       
- 	      'SessaoSEI' => array(
- 	          'SiglaOrgaoSistema' => 'ABC',
- 	          'SiglaSistema' => 'SEI',
- 	          'PaginaLogin' => 'http://localhost/sip/login.php',
- 	          'SipWsdl' => 'http://localhost/sip/controlador_ws.php?servico=wsdl',
- 	          'https' => false),
- 	       
-              // CONFIGURAÇÃO PARA BANCO DE DADOS ORACLE
- 	      'BancoSEI'  => array(
-                  'Servidor' => getenv("MYSQL_PORT_3306_TCP_ADDR"),
-                  'Porta' => getenv("MYSQL_PORT_3306_TCP_PORT"),
-                  'Banco' => 'sei',
-                  'Usuario' => 'sei_user',
-                  'Senha' => 'sei_user',
-                  'Tipo' => 'MySql'), //MySql ou SqlServer
+      'PaginaSEI' => array(
+        'NomeSistema' => 'SEI',
+        'NomeSistemaComplemento' => SEI_VERSAO,
+        'LogoMenu' => ''),
 
-	        // CONFIGURAÇÃO PARA BANCO DE DADOS ORACLE
+      'SessaoSEI' => array(
+        'SiglaOrgaoSistema' => 'ABC',
+        'SiglaSistema' => 'SEI',
+        'PaginaLogin' => 'http://localhost/sip/login.php',
+        'SipWsdl' => 'http://localhost/sip/controlador_ws.php?servico=wsdl',
+        'https' => false),
+
+      // CONFIGURAÇÃO PARA BANCO DE DADOS ORACLE
+      'BancoSEI'  => array(
+        'Servidor' => getenv("MYSQL_PORT_3306_TCP_ADDR"),
+        'Porta' => getenv("MYSQL_PORT_3306_TCP_PORT"),
+        'Banco' => 'sei',
+        'Usuario' => 'sei_user',
+        'Senha' => 'sei_user',
+        'Tipo' => 'MySql'), //MySql ou SqlServer
+
+        // CONFIGURAÇÃO PARA BANCO DE DADOS ORACLE
         /*      'BancoSEI'  => array(
-                  'Servidor' => getenv("ORACLE_PORT_1521_TCP_ADDR"),
-                  'Porta' => getenv("ORACLE_PORT_1521_TCP_PORT"),
-                  'Banco' => 'sei',
-                  'Usuario' => 'sei',
-                  'Senha' => 'sei_user',
-                  'Tipo' => 'Oracle'), //MySql ou SqlServer
+        'Servidor' => getenv("ORACLE_PORT_1521_TCP_ADDR"),
+        'Porta' => getenv("ORACLE_PORT_1521_TCP_PORT"),
+        'Banco' => 'sei',
+        'Usuario' => 'sei_user',
+        'Senha' => 'sei_user',
+        'Tipo' => 'Oracle'), //MySql ou SqlServer
         */
-              'CacheSEI' => array(
-                  'Servidor' => getenv("MEMCACHED_PORT_11211_TCP_ADDR"),
-	          'Porta' => getenv("MEMCACHED_PORT_11211_TCP_PORT")),
 
-              'JODConverter' => array('Servidor' => 'http://'.getenv("JOD_PORT_8080_TCP_ADDR").':'.getenv("JOD_PORT_8080_TCP_PORT").'/converter/service'),
+        'CacheSEI' => array(
+          'Servidor' => getenv("MEMCACHED_PORT_11211_TCP_ADDR"),
+          'Porta' => getenv("MEMCACHED_PORT_11211_TCP_PORT")),
+
+        'JODConverter' => array('Servidor' => 'http://'.getenv("JOD_PORT_8080_TCP_ADDR").':'.getenv("JOD_PORT_8080_TCP_PORT").'/converter/service'),
+
+        'Edoc' => array('Servidor' => 'http://[Servidor .NET]'),
 
- 	      'Edoc' => array('Servidor' => 'http://[Servidor .NET]'),
- 	       
- 	      'Solr' => array(
-                  'Servidor' => 'http://'.getenv("SOLR_PORT_8983_TCP_ADDR").':'.getenv("SOLR_PORT_8983_TCP_PORT").'/solr',
-                  'CoreProtocolos' => 'sei-protocolos',
-                  'TempoCommitProtocolos' => 300,
-                  'CoreBasesConhecimento' => 'sei-bases-conhecimento',
-                  'TempoCommitBasesConhecimento' => 60,
-                  'CorePublicacoes' => 'sei-publicacoes',
-                  'TempoCommitPublicacoes' => 60),
+        'Solr' => array(
+          'Servidor' => 'http://'.getenv("SOLR_PORT_8983_TCP_ADDR").':'.getenv("SOLR_PORT_8983_TCP_PORT").'/solr',
+          'CoreProtocolos' => 'sei-protocolos',
+          'TempoCommitProtocolos' => 300,
+          'CoreBasesConhecimento' => 'sei-bases-conhecimento',
+          'TempoCommitBasesConhecimento' => 60,
+          'CorePublicacoes' => 'sei-publicacoes',
+          'TempoCommitPublicacoes' => 60),
 
-	      'HostWebService' => array(
-	          'Edoc' => array('*'),
-		  'Sip' => array('*'), 
-		  'Publicacao' => array('*'), 
-		  'Ouvidoria' => array('*'),),
- 	       
- 	      'InfraMail' => array(
-	   	  'Tipo' => '2', 
-		  'Servidor' => getenv("SMTP_PORT_1025_TCP_ADDR"),
-		  'Porta' => getenv("SMTP_PORT_1025_TCP_PORT"),
-		  'Codificacao' => '8bit', 
-		  'MaxDestinatarios' => 999, 
-		  'MaxTamAnexosMb' => 999, 
-		  'Seguranca' => '', 
-		  'Autenticar' => false, 
-		  'Usuario' => '',
-		  'Senha' => '',
-		  'Protegido' => '')
+        'HostWebService' => array(
+          'Edoc' => array('*'),
+          'Sip' => array('*'),
+          'Publicacao' => array('*'),
+          'Ouvidoria' => array('*'),),
 
- 	  );
- 	}
-}
-?>
+        'InfraMail' => array(
+          'Tipo' => '2',
+          'Servidor' => getenv("SMTP_PORT_1025_TCP_ADDR"),
+          'Porta' => getenv("SMTP_PORT_1025_TCP_PORT"),
+          'Codificacao' => '8bit',
+          'MaxDestinatarios' => 999,
+          'MaxTamAnexosMb' => 999,
+          'Seguranca' => '',
+          'Autenticar' => false,
+          'Usuario' => '',
+          'Senha' => '',
+          'Protegido' => '')
+        );
+      }
+    }
+    ?>
diff --git a/sei/ConfiguracaoSip.php b/sei/ConfiguracaoSip.php
index 6276355..a986488 100644
--- a/sei/ConfiguracaoSip.php
+++ b/sei/ConfiguracaoSip.php
@@ -16,7 +16,7 @@ class ConfiguracaoSip extends InfraConfiguracao  {
  	      'Sip' => array(
  	          'URL' => 'http://localhost/sip',
  	          'Producao' => false),
- 	       
+
  	      'PaginaSip' => array('NomeSistema' => 'SIP'),
 
  	      'SessaoSip' => array(
@@ -34,13 +34,13 @@ class ConfiguracaoSip extends InfraConfiguracao  {
                   'Usuario' => 'sip_user',
                   'Senha' => 'sip_user',
                   'Tipo' => 'MySql'), //MySql ou SqlServer),
- 
+
               // CONFIGURAÇÃO PARA BASE DE DADOS ORACLE
 /*              'BancoSip'  => array(
                   'Servidor' => getenv("ORACLE_PORT_1521_TCP_ADDR"),
                   'Porta' => getenv("ORACLE_PORT_1521_TCP_PORT"),
                   'Banco' => 'sip',
-                  'Usuario' => 'sip',
+                  'Usuario' => 'sip_user',
                   'Senha' => 'sip_user',
                   'Tipo' => 'Oracle'), //MySql ou SqlServer),
 */
diff --git a/sei/install.sh b/sei/install.sh
index ba62d0f..ac8db63 100644
--- a/sei/install.sh
+++ b/sei/install.sh
@@ -2,10 +2,8 @@
 
 set -e
 
-yum clean all
-
+# Instalação dos componentes básicos do servidor web apache
 yum -y  update
-
 yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 crontabs
 
 # Instalação do PHP e demais extenções necessárias para o projeto
@@ -13,7 +11,6 @@ wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
 wget https://centos6.iuscommunity.org/ius-release.rpm
 rpm -ivh epel-release-latest-6.noarch.rpm
 rpm -ivh ius-release.rpm
-
 yum -y update
 
 # Instalação do PHP e demais extenções necessárias para o projeto
@@ -46,4 +43,3 @@ echo "00 01 * * * root rm -rf /opt/sip/temp/*" >> /etc/cron.d/sip
 yum -y clean all
 
 exit 0
-
diff --git a/sei/sei.conf b/sei/sei.conf
index 9adba6e..4106dc2 100644
--- a/sei/sei.conf
+++ b/sei/sei.conf
@@ -35,22 +35,3 @@ Alias "/infra_js" "/opt/infra/infra_js"
     </Directory>
 
 </VirtualHost>
-
-<IfModule prefork.c>
-    StartServers 20
-    MinSpareServers 10
-    MaxSpareServers 30
-    ServerLimit 2000
-    MaxClients 2000
-    MaxRequestsPerChild 0
-</IfModule>
-
-<IfModule worker.c>
-    StartServers 3
-    MaxClients 150
-    MinSpareThreads 25
-    MaxSpareThreads 75
-    ThreadsPerChild 25
-    MaxRequestsPerChild 10000
-</IfModule>
-
diff --git a/sei/sei.ini b/sei/sei.ini
index 9770a53..0cd5998 100644
--- a/sei/sei.ini
+++ b/sei/sei.ini
@@ -16,4 +16,3 @@ max_input_vars = 2000
 magic-quotes-gpc = 0
 magic_quotes_runtime = 0
 magic_quotes_sybase = 0
-html_errors = 0
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 029eeee..a734f64 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,28 +1,24 @@
-############################################################################
-# Dockerfile de construção do container Solr utilizado pelo SEI e pelo SIP #
-############################################################################
+################################################################################
+# Dockerfile de construção do container Solr utilizado pelo SEI e pelo SIP
+#
+# Container preparado e configurado para uso em desenvolvimento e testes
+################################################################################
 
-# Definição da imagem de base para o OpenJDK 8
-FROM openjdk:8
-
-# Autor e mantenedor do container
 MAINTAINER PEN - Processo Eletrônico Nacional
+FROM openjdk:8
 
-################## INICIO DA INSTALACAO ######################
+############################# INÍCIO DA INSTALACAO #############################
 
 ENV TERM xterm
 
 # Obtenção do pacote de instalação do Solr
-COPY install.sh /install.sh
 COPY solr-6.1.0.tgz /tmp/
 COPY index/* /tmp/
+COPY install.sh /install.sh
 
 RUN bash /install.sh
 
-##################### FIM DA INSTALACAO #####################
+############################## FIM DA INSTALACAO ###############################
 
-# Exposição da porta de conexão ao Apache Solr
 EXPOSE 8983
-
-# Inicialização do Apache Solr
 CMD ["/opt/solr/bin/solr", "start", "-f", "-p", "8983"]
--
libgit2 0.21.2