diff --git a/colab/proxy/context_processors.py b/colab/proxy/context_processors.py
index 658a91b..040947f 100644
--- a/colab/proxy/context_processors.py
+++ b/colab/proxy/context_processors.py
@@ -1,5 +1,4 @@
 
-from django.apps import apps
 from django.conf import settings
 
 
diff --git a/colab/proxy/gitlab/urls.py b/colab/proxy/gitlab/urls.py
index 827b541..fa2ec6b 100644
--- a/colab/proxy/gitlab/urls.py
+++ b/colab/proxy/gitlab/urls.py
@@ -3,7 +3,6 @@ from django.conf.urls import patterns, url
 
 from .views import GitlabProxyView
 
-
 urlpatterns = patterns('',
     # Gitlab URLs
     url(r'^(?P<path>.*)$', GitlabProxyView.as_view(), name='gitlab'),
diff --git a/colab/proxy/templatetags/proxy.py b/colab/proxy/templatetags/proxy.py
index 54246b3..9762904 100644
--- a/colab/proxy/templatetags/proxy.py
+++ b/colab/proxy/templatetags/proxy.py
@@ -1,6 +1,5 @@
 from collections import OrderedDict
 
-from django.core.urlresolvers import reverse
 from django import template
 from django.core.cache import cache
 from django.template.loader import render_to_string
diff --git a/colab/settings.py b/colab/settings.py
index 245387d..90167fc 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -292,11 +292,6 @@ if locals().get('RAVEN_DSN', False):
 BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
 
-PROXIED_APPS = locals().get('PROXIED_APPS') or {}
-
-for app_label in PROXIED_APPS.keys():
-    INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),)
-
 COLAB_APPS = locals().get('COLAB_APPS') or {}
 
 for app_name, app in COLAB_APPS.items():
@@ -328,6 +323,21 @@ for app_name, app in COLAB_APPS.items():
 import sys
 sys.path.insert(0, '/etc/colab/')
 try:
-    from plugin_configs import *
+    from plugin_configs import *  # noqa (flake8 ignore)
 except ImportError:
     pass
+
+from django.apps import apps
+import django
+django.setup()
+
+PROXIED_APPS = {}
+
+for app_name in COLAB_APPS:
+    try:
+        config = apps.get_app_config(app_name.split('.')[-1])
+    except:
+        config = None
+
+    if config and getattr(config, 'colab_proxied_app', False):
+        PROXIED_APPS[app_name.split('.')[-1]] = COLAB_APPS[app_name]
--
libgit2 0.21.2