diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb
index b729390..6b24eb2 100644
--- a/cookbooks/colab/recipes/default.rb
+++ b/cookbooks/colab/recipes/default.rb
@@ -38,7 +38,7 @@ execute 'secret-key' do
   f = '/etc/colab/secret.key'
   command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
   not_if { File.exists?(f) }
-  notifies :create, 'template[/etc/colab/settings.d/04-custom_settings.py]'
+  notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
 end
 
 template '/etc/sysconfig/colab' do
@@ -48,14 +48,14 @@ template '/etc/sysconfig/colab' do
   notifies :restart, 'service[colab]'
 end
 
-template '/etc/colab/settings.d/00-database.py' do
+template '/etc/colab/settings.d/00-custom_settings.py' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
 end
 
-template '/etc/colab/settings.d/04-custom_settings.py' do
+template '/etc/colab/settings.d/01-database.py' do
   owner  'root'
   group  'colab'
   mode   0640
@@ -104,13 +104,13 @@ template '/etc/colab/settings.d/03-sentry.py' do
   mode   0640
 end
 
-template '/etc/colab/settings.d/memcached.py' do
+template '/etc/colab/settings.d/04-memcached.py' do
   owner 'root'
   group 'colab'
   mode 0640
 end
 
-template '/etc/colab/settings.d/redis.py' do
+template '/etc/colab/settings.d/05-redis.py' do
   owner 'root'
   group 'colab'
   mode 0640
diff --git a/cookbooks/colab/templates/00-custom_settings.py.erb b/cookbooks/colab/templates/00-custom_settings.py.erb
new file mode 100644
index 0000000..4cac391
--- /dev/null
+++ b/cookbooks/colab/templates/00-custom_settings.py.erb
@@ -0,0 +1,37 @@
+## Set to false in production
+DEBUG = False
+TEMPLATE_DEBUG = False
+
+## System admins
+ADMINS = [
+<%- node['config']['admins'].each do |admin| %>
+  ("<%= admin[0] %>", "<%= admin[1] %>"),
+<% end %>
+]
+
+MANAGERS = ADMINS
+
+# general Django settings
+DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
+
+# colab-specific
+COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
+SERVER_EMAIL = '<%= node['config']['server_email'] %>'
+
+EMAIL_HOST = "localhost"
+EMAIL_PORT =  25
+EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
+
+SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
+
+SITE_URL = "<%= node['config']['site_url'] %>"
+
+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
+
+## Disable indexing
+ROBOTS_NOINDEX = False
+
+## Set URL of Colab home
+COLAB_HOME_URL = '/social'
+
+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
diff --git a/cookbooks/colab/templates/00-database.py.erb b/cookbooks/colab/templates/00-database.py.erb
deleted file mode 100644
index 6e5a4ae..0000000
--- a/cookbooks/colab/templates/00-database.py.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': "<%= node['peers']['database'] %>",
-        'NAME': 'colab',
-        'USER': 'colab'
-    }
-}
diff --git a/cookbooks/colab/templates/01-database.py.erb b/cookbooks/colab/templates/01-database.py.erb
new file mode 100644
index 0000000..6e5a4ae
--- /dev/null
+++ b/cookbooks/colab/templates/01-database.py.erb
@@ -0,0 +1,8 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'HOST': "<%= node['peers']['database'] %>",
+        'NAME': 'colab',
+        'USER': 'colab'
+    }
+}
diff --git a/cookbooks/colab/templates/04-custom_settings.py.erb b/cookbooks/colab/templates/04-custom_settings.py.erb
deleted file mode 100644
index 4cac391..0000000
--- a/cookbooks/colab/templates/04-custom_settings.py.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-## Set to false in production
-DEBUG = False
-TEMPLATE_DEBUG = False
-
-## System admins
-ADMINS = [
-<%- node['config']['admins'].each do |admin| %>
-  ("<%= admin[0] %>", "<%= admin[1] %>"),
-<% end %>
-]
-
-MANAGERS = ADMINS
-
-# general Django settings
-DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
-
-# colab-specific
-COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
-SERVER_EMAIL = '<%= node['config']['server_email'] %>'
-
-EMAIL_HOST = "localhost"
-EMAIL_PORT =  25
-EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
-
-SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
-
-SITE_URL = "<%= node['config']['site_url'] %>"
-
-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
-
-## Disable indexing
-ROBOTS_NOINDEX = False
-
-## Set URL of Colab home
-COLAB_HOME_URL = '/social'
-
-GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
diff --git a/cookbooks/colab/templates/04-memcached.py.erb b/cookbooks/colab/templates/04-memcached.py.erb
new file mode 100644
index 0000000..f74c9d5
--- /dev/null
+++ b/cookbooks/colab/templates/04-memcached.py.erb
@@ -0,0 +1,6 @@
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+    }
+}
diff --git a/cookbooks/colab/templates/05-redis.py.erb b/cookbooks/colab/templates/05-redis.py.erb
new file mode 100644
index 0000000..c7f3aab
--- /dev/null
+++ b/cookbooks/colab/templates/05-redis.py.erb
@@ -0,0 +1,2 @@
+BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
+CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
diff --git a/cookbooks/colab/templates/memcached.py.erb b/cookbooks/colab/templates/memcached.py.erb
deleted file mode 100644
index f74c9d5..0000000
--- a/cookbooks/colab/templates/memcached.py.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
-    }
-}
diff --git a/cookbooks/colab/templates/redis.py.erb b/cookbooks/colab/templates/redis.py.erb
deleted file mode 100644
index c7f3aab..0000000
--- a/cookbooks/colab/templates/redis.py.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
-CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
--
libgit2 0.21.2