diff --git a/Vagrantfile b/Vagrantfile
index 72cb68d82..0423a9239 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -75,14 +75,15 @@ ansible_provision = proc do |ansible|
       rbd_mirror_containerized_deployment: 'true',
       ceph_mon_docker_interface: ETH,
       ceph_mon_docker_subnet: "#{SUBNET}.0/24",
-      ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100",
+      ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE=100",
       cluster_network: "#{SUBNET}.0/24",
       public_network: "#{SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
       # Note that OSVM is defaulted to false above
       ceph_docker_on_openstack: OSVM,
       ceph_rgw_civetweb_port: 8080,
-      generate_fsid: 'true'
+      generate_fsid: 'true',
+      journal_size: 100,
     }
   else
     ansible.extra_vars = {
diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index f04ddbd47..4f569f706 100644
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -145,7 +145,7 @@ dummy:
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
 #ceph_osd_docker_image_tag: latest
-#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
+#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
 #ceph_osd_docker_devices:
 # - /dev/sdb
 #ceph_docker_on_openstack: false
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 97002b1f5..6c0c21fde 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -137,7 +137,7 @@ ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 ceph_osd_docker_username: ceph
 ceph_osd_docker_imagename: daemon
 ceph_osd_docker_image_tag: latest
-ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
+ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
 #ceph_osd_docker_devices:
 # - /dev/sdb
 ceph_docker_on_openstack: false
diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
index 9f34a9811..3bfdb3ade 100644
--- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml
+++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -31,7 +31,7 @@
     -v /etc/localtime:/etc/localtime:ro \
     -e "OSD_DEVICE={{ item.0 }}" \
     -e "{{ ceph_osd_docker_prepare_env }}" \
-    -e CEPH_DAEMON=osd_ceph_disk_prepare \
+    -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
     "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
   with_together:
     - ceph_osd_docker_devices
@@ -52,7 +52,7 @@
     -v /etc/localtime:/etc/localtime:ro \
     -e "OSD_DEVICE={{ item.0 }}" \
     -e "{{ ceph_osd_docker_prepare_env }}" \
-    -e CEPH_DAEMON=osd_ceph_disk_prepare \
+    -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
     -e KV_TYPE={{kv_type}} \
     -e KV_IP={{kv_endpoint}} \
     -e KV_PORT={{kv_port}} \