diff --git a/defaults/main.yml b/defaults/main.yml
index c7c9e55..139f09d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,17 +1,8 @@
 ---
 mastodon_initial_setup: false
-
 mastodon_owner: MyUser
 mastodon_owner_email: myemail@example.org
-
 mastodon_environment: production
-
-redis_pass: "{{ vault_mastodon_redis_password }}"
-redis_host: redis
-redis_port: 6379
-redis_cache_host: redis-volatile
-redis_cache_port: 6379
-
 mastodon_repo: https://github.com/ajdelgado/mastodon.git # https://github.com/mastodon/mastodon.git # I had problems using the upstream so I had to update a few things
 mastodon_secret_key_base: "{{ vault_mastodon_secret_key_base }}"
 mastodon_otp_secret: "{{ vault_mastodon_otp_secret }}"
@@ -37,6 +28,11 @@ mastodon_db_user: "{{ mastodon_user }}"
 mastodon_path: "live"
 mastodon_nginx_symlink: "/var/www/html/mastodon"
 
+redis_pass: "{{ vault_mastodon_redis_password }}"
+redis_host: redis
+redis_port: 6379
+redis_cache_host: redis-volatile
+redis_cache_port: 6379
 
 vapid_public_key: "{{ vault_mastodon_vapid_public_key }}"
 vapid_private_key: "{{ vault_mastodon_vapid_private_key }}"