diff --git a/addons/aldryn-django-cms/aldryn_config.py b/addons/aldryn-django-cms/aldryn_config.py
index 5e54f76..3fc7113 100644
--- a/addons/aldryn-django-cms/aldryn_config.py
+++ b/addons/aldryn-django-cms/aldryn_config.py
@@ -55,7 +55,7 @@ class Form(forms.BaseForm):
 
     def to_settings(self, data, settings):
         from functools import partial
-        from django.urls import reverse_lazy
+        from django.core.urlresolvers import reverse_lazy
         from aldryn_addons.utils import boolean_ish, djsenv
 
         env = partial(djsenv, settings=settings)
@@ -88,24 +88,24 @@ class Form(forms.BaseForm):
             'djangocms_admin_style',
         )
 
-        settings['TEMPLATES'][0]['OPTIONS']['context_processors'].extend([
-            'sekizai.context_processors.sekizai',
-            'cms.context_processors.cms_settings',
-        ])
+        if is_django_18_or_later:
+            settings['TEMPLATES'][0]['OPTIONS']['context_processors'].extend([
+                'sekizai.context_processors.sekizai',
+                'cms.context_processors.cms_settings',
+            ])
+        else:
+            settings['TEMPLATE_CONTEXT_PROCESSORS'].extend([
+                'sekizai.context_processors.sekizai',
+                'cms.context_processors.cms_settings',
+            ])
 
-        middlewares = [
+        settings['MIDDLEWARE_CLASSES'].extend([
             'cms.middleware.user.CurrentUserMiddleware',
             'cms.middleware.page.CurrentPageMiddleware',
             'cms.middleware.toolbar.ToolbarMiddleware',
             'cms.middleware.language.LanguageCookieMiddleware',
-        ]
-
-        if settings.get('MIDDLEWARE_CLASSES', None):
-            settings['MIDDLEWARE_CLASSES'].extend(middlewares)
-            settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware', )
-        else:
-            settings['MIDDLEWARE'].extend(middlewares)
-            settings['MIDDLEWARE'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware', )
+        ])
+        settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',)
 
         settings['ADDON_URLS_I18N_LAST'] = 'cms.urls'
 
@@ -183,14 +183,19 @@ class Form(forms.BaseForm):
         )
         settings['INSTALLED_APPS'].append('aldryn_boilerplates')
 
-        TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATES'][0]['OPTIONS']['context_processors']
-        TEMPLATE_LOADERS = settings['TEMPLATES'][0]['OPTIONS']['loaders']
+        if is_django_18_or_later:
+            TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATES'][0]['OPTIONS']['context_processors']
+            TEMPLATE_LOADERS = settings['TEMPLATES'][0]['OPTIONS']['loaders']
+        else:
+            TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATE_CONTEXT_PROCESSORS']
+            TEMPLATE_LOADERS = settings['TEMPLATE_LOADERS']
         TEMPLATE_CONTEXT_PROCESSORS.extend([
             'aldryn_boilerplates.context_processors.boilerplate',
             'aldryn_snake.template_api.template_processor',
         ])
         TEMPLATE_LOADERS.insert(
-            TEMPLATE_LOADERS.index('django.template.loaders.app_directories.Loader'),
+            TEMPLATE_LOADERS.index(
+                'django.template.loaders.app_directories.Loader'),
             'aldryn_boilerplates.template_loaders.AppDirectoriesLoader'
         )
 
diff --git a/requirements.in b/requirements.in
index f5c5c86..aa8b1bd 100644
--- a/requirements.in
+++ b/requirements.in
@@ -2,7 +2,7 @@
 https://control.divio.com/api/v1/apps/serve/aldryn-addons/1.0.4/5cc40a55-a1e5-4906-a8df-03a1029a62f5/aldryn-addons-1.0.4.tar.gz#egg=aldryn-addons==1.0.4
 https://control.divio.com/api/v1/apps/serve/aldryn-django/1.11.20.1/81a21283-635d-457e-a4c0-668dff0a483a/aldryn-django-1.11.20.1.tar.gz#egg=aldryn-django==1.11.20.1
 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.5.1/4e2eb564-fbf5-4d5f-96e0-4059f3185ffe/aldryn-sso-1.5.1.tar.gz#egg=aldryn-sso==1.5.1
-https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.6.0.7/69dadc68-91c9-4a01-b9ae-fe37f8f513e5/aldryn-django-cms-3.6.0.7.tar.gz#egg=aldryn-django-cms==3.6.0.7
+https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.2.2/88bf7991-90a3-4c98-acf5-42c3fa14e2a4/aldryn-django-cms-3.5.2.2.tar.gz#egg=aldryn-django-cms==3.5.2.2
 https://control.divio.com/api/v1/apps/serve/aldryn-forms/4.0.1/099d84c4-390a-4c5d-b57d-5a0eacff6627/aldryn-forms-4.0.1.tar.gz#egg=aldryn-forms==4.0.1
 https://control.divio.com/api/v1/apps/serve/aldryn-haystack/0.5.1/bf04cc01-9855-4659-843e-05379cec9ac6/aldryn-haystack-0.5.1.tar.gz#egg=aldryn-haystack==0.5.1
 https://control.divio.com/api/v1/apps/serve/djangocms-history/1.0.0/9ced0786-b47c-4df1-8794-6654d618d753/djangocms-history-1.0.0.tar.gz#egg=djangocms-history==1.0.0