diff --git a/make_config.py b/make_config.py
index c69980ee9..e807e80e6 100644
--- a/make_config.py
+++ b/make_config.py
@@ -7,6 +7,8 @@
 
 root = os.environ.get("UBERSYSTEM_ROOT", "/app")
 config = os.environ.get("UBERSYSTEM_CONFIG", "[]")
+secrets = yaml.load(os.environ.get("UBERSYSTEM_SECRETS", "{}"), Loader=yaml.Loader)
+
 
 plugins = os.listdir(os.path.join(root, "plugins"))
 plugin_configs = {x: [] for x in plugins}
@@ -50,6 +52,8 @@
         config = configs[0]
         for override in configs[1:]:
             config.merge(override)
+        if plugin in secrets:
+            config.merge(ConfigObj(secrets[plugin]))
         config.filename = os.path.join(root, "plugins/", plugin, "development.ini")
         config.write()
         with open(os.path.join(root, "plugins/", plugin, "development.ini"), "r") as CONFIG:
@@ -59,6 +63,8 @@
     config = sideboard_configs[0]
     for override in configs[1:]:
         config.merge(override)
+    if "sideboard" in secrets:
+        config.merge(ConfigObj(secrets["sideboard"]))
     config.filename = os.path.join(root, "development.ini")
     config.write()
     with open(os.path.join(root, "development.ini"), "r") as CONFIG: