diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
index 4a61bc73e373e03d01a1dce65331a9366a4e7ac1..75735036aaf29e9a2926c73bedf2115ce6741380 100644
--- a/core/Container/ContainerFactory.php
+++ b/core/Container/ContainerFactory.php
@@ -116,6 +116,17 @@ class ContainerFactory
         if (file_exists($file)) {
             $builder->addDefinitions($file);
         }
+
+        // add plugin environment configs
+        $plugins = $this->pluginList->getActivatedPlugins();
+        foreach ($plugins as $plugin) {
+            $baseDir = Manager::getPluginsDirectory() . $plugin;
+
+            $environmentFile = $baseDir . '/config/' . $environment . '.php';
+            if (file_exists($environmentFile)) {
+                $builder->addDefinitions($environmentFile);
+            }
+        }
     }
 
     private function addPluginConfigs(ContainerBuilder $builder)
@@ -129,13 +140,6 @@ class ContainerFactory
             if (file_exists($file)) {
                 $builder->addDefinitions($file);
             }
-
-            foreach ($this->environments as $environment) {
-                $environmentFile = $baseDir . '/config/' . $environment . '.php';
-                if (file_exists($environmentFile)) {
-                    $builder->addDefinitions($environmentFile);
-                }
-            }
         }
     }
 
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index eeaa41b2ac0aa559caf2ef7c1be3b893de69c795..e16861f1d8b77fdf3151d31a795a10c3bc5d3ba9 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit eeaa41b2ac0aa559caf2ef7c1be3b893de69c795
+Subproject commit e16861f1d8b77fdf3151d31a795a10c3bc5d3ba9
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index 35288ec165fc085360ec77b441dc25f51e04cd5f..efe6eca0e514d97a299c10d8a1f94352a2fe5a30 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit 35288ec165fc085360ec77b441dc25f51e04cd5f
+Subproject commit efe6eca0e514d97a299c10d8a1f94352a2fe5a30
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index 65c7b5a1693b99dc97b78df015df1f606b2ef8b2..42dcc8dc9ccde4b8ff819bf05bbe3c3f862f39eb 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit 65c7b5a1693b99dc97b78df015df1f606b2ef8b2
+Subproject commit 42dcc8dc9ccde4b8ff819bf05bbe3c3f862f39eb
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 32915362e3f90f8e98929108ccc13695a820c2fd..a994e842e6a6db74001eff2107dab70c0dd2b274 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 32915362e3f90f8e98929108ccc13695a820c2fd
+Subproject commit a994e842e6a6db74001eff2107dab70c0dd2b274
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 9640640f7b49374790330699c9985634ecb9c0ae..b39f286d93156d280c3b8f02f9637f20971a5fc7 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 9640640f7b49374790330699c9985634ecb9c0ae
+Subproject commit b39f286d93156d280c3b8f02f9637f20971a5fc7
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 6ef251bbe316882c010408180c293af3b2a2ef2a..a52e046866d7d0ab330bf6d7466e86dda82962ab 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 6ef251bbe316882c010408180c293af3b2a2ef2a
+Subproject commit a52e046866d7d0ab330bf6d7466e86dda82962ab