diff --git a/2018.09/apache/Dockerfile b/2018.09/apache/Dockerfile
index ec6efce..dfcb3b0 100644
--- a/2018.09/apache/Dockerfile
+++ b/2018.09/apache/Dockerfile
@@ -10,7 +10,7 @@ RUN set -ex; \
         rsync \
         bzip2 \
         git \
-      # mail() support
+# For mail() support
         ssmtp \
     ; \
     rm -rf /var/lib/apt/lists/*;
diff --git a/2018.09/apache/upgrade.exclude b/2018.09/apache/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.09/apache/upgrade.exclude
+++ b/2018.09/apache/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/2018.09/fpm-alpine/Dockerfile b/2018.09/fpm-alpine/Dockerfile
index 509f377..e8b697f 100644
--- a/2018.09/fpm-alpine/Dockerfile
+++ b/2018.09/fpm-alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN set -ex; \
     apk add --no-cache \
         rsync \
         git \
-     # mail() support
+# For mail() support
         ssmtp;
 
 # install the PHP extensions we need
diff --git a/2018.09/fpm-alpine/upgrade.exclude b/2018.09/fpm-alpine/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.09/fpm-alpine/upgrade.exclude
+++ b/2018.09/fpm-alpine/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/2018.09/fpm/Dockerfile b/2018.09/fpm/Dockerfile
index e6f066e..facb208 100644
--- a/2018.09/fpm/Dockerfile
+++ b/2018.09/fpm/Dockerfile
@@ -10,7 +10,7 @@ RUN set -ex; \
         rsync \
         bzip2 \
         git \
-      # mail() support
+# For mail() support
         ssmtp \
     ; \
     rm -rf /var/lib/apt/lists/*;
diff --git a/2018.09/fpm/upgrade.exclude b/2018.09/fpm/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.09/fpm/upgrade.exclude
+++ b/2018.09/fpm/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/2018.12-dev/apache/Dockerfile b/2018.12-dev/apache/Dockerfile
index 50fcd01..9056c35 100644
--- a/2018.12-dev/apache/Dockerfile
+++ b/2018.12-dev/apache/Dockerfile
@@ -10,7 +10,7 @@ RUN set -ex; \
         rsync \
         bzip2 \
         git \
-      # mail() support
+# For mail() support
         ssmtp \
     ; \
     rm -rf /var/lib/apt/lists/*;
diff --git a/2018.12-dev/apache/upgrade.exclude b/2018.12-dev/apache/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.12-dev/apache/upgrade.exclude
+++ b/2018.12-dev/apache/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/2018.12-dev/fpm-alpine/Dockerfile b/2018.12-dev/fpm-alpine/Dockerfile
index aac87b6..dfcbf17 100644
--- a/2018.12-dev/fpm-alpine/Dockerfile
+++ b/2018.12-dev/fpm-alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN set -ex; \
     apk add --no-cache \
         rsync \
         git \
-     # mail() support
+# For mail() support
         ssmtp;
 
 # install the PHP extensions we need
diff --git a/2018.12-dev/fpm-alpine/upgrade.exclude b/2018.12-dev/fpm-alpine/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.12-dev/fpm-alpine/upgrade.exclude
+++ b/2018.12-dev/fpm-alpine/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/2018.12-dev/fpm/Dockerfile b/2018.12-dev/fpm/Dockerfile
index de10310..0a6dd33 100644
--- a/2018.12-dev/fpm/Dockerfile
+++ b/2018.12-dev/fpm/Dockerfile
@@ -10,7 +10,7 @@ RUN set -ex; \
         rsync \
         bzip2 \
         git \
-      # mail() support
+# For mail() support
         ssmtp \
     ; \
     rm -rf /var/lib/apt/lists/*;
diff --git a/2018.12-dev/fpm/upgrade.exclude b/2018.12-dev/fpm/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/2018.12-dev/fpm/upgrade.exclude
+++ b/2018.12-dev/fpm/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 227873c..85c4052 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -6,7 +6,7 @@ RUN set -ex; \
     apk add --no-cache \
         rsync \
         git \
-     # mail() support
+# For mail() support
         ssmtp;
 
 # install the PHP extensions we need
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8af9bd9..a27da27 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -9,7 +9,7 @@ RUN set -ex; \
         rsync \
         bzip2 \
         git \
-      # mail() support
+# For mail() support
         ssmtp \
     ; \
     rm -rf /var/lib/apt/lists/*;
diff --git a/upgrade.exclude b/upgrade.exclude
index 1185fa0..a9dc3ee 100644
--- a/upgrade.exclude
+++ b/upgrade.exclude
@@ -4,4 +4,5 @@
 .htconfig.php
 .htaccess
 home.*
-/config/local.ini.php
\ No newline at end of file
+/config/local.ini.php
+/config/addon.ini.php
\ No newline at end of file