diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 32dbaa8df..bbd581075 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -331,3 +331,17 @@ docker: false
 # by ceph.conf.j2 template. so it should always be defined
 mon_containerized_deployment_with_kv: false
 
+
+##################
+# Temporary Vars #
+##################
+# NOTE(SamYaple): These vars are set here to they are defined before use. They
+# should be removed after a refactor has properly seperated all the checks into
+# the appropriate roles.
+
+journal_collocation: False
+raw_multi_journal: False
+osd_directory: False
+bluestore: False
+
+osd_auto_discovery: False