diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs
index 5a473fd74..ac33941ea 100644
--- a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs
+++ b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs
@@ -13,12 +13,15 @@ namespace NzbDrone.Common.Composition
     {
         private readonly List<Type> _loadedTypes;
 
-        public IContainer Container { get; private set; }
+        protected IContainer Container { get; }
 
-        protected ContainerBuilderBase(IStartupContext args, params string[] assemblies)
+        protected ContainerBuilderBase(IStartupContext args, List<string> assemblies)
         {
             _loadedTypes = new List<Type>();
 
+            assemblies.Add(OsInfo.IsWindows ? "NzbDrone.Windows" : "NzbDrone.Mono");
+            assemblies.Add("NzbDrone.Common");
+
             foreach (var assembly in assemblies)
             {
                 _loadedTypes.AddRange(Assembly.Load(assembly).GetTypes());
diff --git a/src/NzbDrone.Host/MainAppContainerBuilder.cs b/src/NzbDrone.Host/MainAppContainerBuilder.cs
index ca31bb723..23ba6a0dd 100644
--- a/src/NzbDrone.Host/MainAppContainerBuilder.cs
+++ b/src/NzbDrone.Host/MainAppContainerBuilder.cs
@@ -15,26 +15,15 @@ namespace NzbDrone.Host
             var assemblies = new List<string>
                              {
                                  "NzbDrone.Host",
-                                 "NzbDrone.Common",
                                  "NzbDrone.Core",
                                  "NzbDrone.Api",
                                  "NzbDrone.SignalR"
                              };
 
-            if (OsInfo.IsWindows)
-            {
-                assemblies.Add("NzbDrone.Windows");
-            }
-
-            else
-            {
-                assemblies.Add("NzbDrone.Mono");
-            }
-
-            return new MainAppContainerBuilder(args, assemblies.ToArray()).Container;
+            return new MainAppContainerBuilder(args, assemblies).Container;
         }
 
-        private MainAppContainerBuilder(StartupContext args, string[] assemblies)
+        private MainAppContainerBuilder(StartupContext args, List<string> assemblies)
             : base(args, assemblies)
         {
             AutoRegisterImplementations<NzbDronePersistentConnection>();
diff --git a/src/NzbDrone.Update/UpdateContainerBuilder.cs b/src/NzbDrone.Update/UpdateContainerBuilder.cs
index 2af2a5adc..0dd0fc079 100644
--- a/src/NzbDrone.Update/UpdateContainerBuilder.cs
+++ b/src/NzbDrone.Update/UpdateContainerBuilder.cs
@@ -7,7 +7,7 @@ namespace NzbDrone.Update
 {
     public class UpdateContainerBuilder : ContainerBuilderBase
     {
-        private UpdateContainerBuilder(IStartupContext startupContext, string[] assemblies)
+        private UpdateContainerBuilder(IStartupContext startupContext, List<string> assemblies)
             : base(startupContext, assemblies)
         {
             Container.Register<IHttpDispatcher, FallbackHttpDispatcher>();
@@ -17,22 +17,10 @@ namespace NzbDrone.Update
         {
             var assemblies = new List<string>
                              {
-                                 "NzbDrone.Update",
-                                 "NzbDrone.Common"
+                                 "NzbDrone.Update"
                              };
 
-            if (OsInfo.IsWindows)
-            {
-                assemblies.Add("NzbDrone.Windows");
-            }
-
-            else
-            {
-                assemblies.Add("NzbDrone.Mono");
-            }
-
-            return new UpdateContainerBuilder(startupContext, assemblies.ToArray()).Container;
+            return new UpdateContainerBuilder(startupContext, assemblies).Container;
         }
     }
 }
- 
\ No newline at end of file