diff --git a/config/config.yml.example b/config/config.yml.example
deleted file mode 100644
index 0e46666b..00000000
--- a/config/config.yml.example
+++ /dev/null
@@ -1,41 +0,0 @@
-defaults: &defaults
-  # The name of your instance
-  name: OSEM
-  # The sender address of emails
-  sender_for_emails: "no-reply@localhost"
-  # The hostname to be used when building the URL in the emails
-  url_for_emails: "localhost:3000"
-  # errbit configuration, get your own instance: https://github.com/errbit/errbit
-  #errbit_key: See config/secrets.yml
-  #errbit_host: errbit.exmaple.com
-  # These are the currently supported commercial types for conference and events
-
-  # If you want to use iChain to handle registration and authentication enable the next lines
-  authentication:
-    ichain:
-      enabled: false
-
-  # Set it to false if you don't want FactoryGirl lint to run before every test suit.
-  # You can run lint manually with: bundle exec rake factory_girl:lint
-  factory_girl_lint: true
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults
-
-  # If you add more providers that do not require a key, you still have to create the 2 variables with sample data
-
-  transifex_live_api_key: ''
-
-  # Set the smtp configuration of your service provider
-  # For further details of each configuration checkout: http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration
-  mail_address: 'smtp.host.com'
-  mail_port: 587
-  mail_username: 'username@host.com'
-  mail_password: 'password'
-  mail_authentication: 'plain'
diff --git a/config/deploy.rb b/config/deploy.rb
index 4821ea37..7ac957c4 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,7 +10,7 @@ set :repository, 'https://github.com/openSUSE/osem.git'
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
-set :shared_paths, %w{ config/database.yml log public/system config/secrets.yml config/config.yml config/piwik.yml tmp}
+set :shared_paths, %w{ config/database.yml log public/system config/secrets.yml config/piwik.yml tmp}
 
 task setup: :environment do
   queue! %[mkdir -p "#{deploy_to}/shared/log"]
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 5f97b833..fc3c1496 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -1,18 +1,9 @@
-defaults: &defaults
-  # You can generate secret keys with 'rake secret'
-
-  # For rails cookies
-  secret_key_base: '12345'
-
-  # For devise login tokens
-  devise_secret_key: '12345'
-
-  # Your errbit API key
-  # errbit_key: '12345'
-
 development:
-  <<: *defaults
-  # Sample data so that mocks work
+  # Generate your own with rake secret
+  # secret_key_base: '12345'
+
+  ########## OMNIAUT Providers ##########
+  # This is just sample data so mocks work
   google_key: 'sample'
   google_secret: 'sample'
 
@@ -23,33 +14,45 @@ development:
   suse_secret: 'sample'
 
 test:
-  <<: *defaults
+  # Generate your own with rake secret
+  # secret_key_base: '12345'
 
 production:
-  <<: *defaults
-  # Leave the variables' names empty, unless you use the providers, in which case you need to
-  # register your applicaton and add the actual keys.
+  # Generate your own with rake secret or use the environment
+  # secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
 
-  # If you add more providers, keep the format of the variables: provider_key, provider_secret
+  # Your errbit API key
+  # errbit_key: '12345'
 
-  # Register your appllication with Google from https://code.google.com/apis/console#:access
+  ########## OMNIAUT Providers ##########
+  # Leave the variables' names empty, unless you use the providers, in which
+  # case you need to register your applicaton and add the actual keys.
+  #
+  # If you add a provider, keep the format of the variables:
+  # *provider*_key and *provider*_secret
+
+  # If you add a provider that does not require a key, you still have to
+  # create the 2 variables with sample data or they won't show up in the app.
+
+  # Register your appllication with Google from
+  # https://code.google.com/apis/console#:access
   google_key: ''
   google_secret: ''
 
-  # Register your application with Facebook from https://developers.facebook.com/
+  # Register your application with Facebook from
+  # https://developers.facebook.com/
   facebook_key: ''
   facebook_secret: ''
 
-  # Developers do not need to register their application for suse account to work.
-  # You must, however, add some sample value to the variables, for the login option to appear.
-  # For example:
+  # Developers do not need to register their application for suse account to
+  # work. You must, however, add some sample value to the variables, for the
+  # login option to appear. For example:
   #suse_key: 'sample data'
   #suse_secret: 'sample data'
   suse_key: ''
   suse_secret: ''
 
-  # Register your application with GitHub from https://github.com/settings/applications
+  # Register your application with GitHub from
+  # https://github.com/settings/applications
   github_key: ''
   github_secret: ''
-
-  # If you add more providers that do not require a key, you still have to create the 2 variables with sample data