diff --git a/roles/chronos-sync/tasks/main.yml b/roles/chronos-sync/tasks/main.yml
index 748666f..0c35607 100644
--- a/roles/chronos-sync/tasks/main.yml
+++ b/roles/chronos-sync/tasks/main.yml
@@ -24,4 +24,4 @@
   pip: name=awscli state=present
 
 - name: Setup chronos sync
-  git: repo=https://github.com/mesos/chronos.git dest=/opt/chronos
+  git: repo=https://github.com/mesos/chronos.git dest=/opt/chronos version={{chronos_version}} force=yes
diff --git a/roles/common/tasks/RedHat.yml b/roles/common/tasks/RedHat.yml
index cdb8e6a..8800402 100644
--- a/roles/common/tasks/RedHat.yml
+++ b/roles/common/tasks/RedHat.yml
@@ -28,17 +28,17 @@
   changed_when: true
 
 - name: update kernel-firmware
-  get_url: dest=/home/{{ansible_ssh_user}}/kernel-firmware.rpm  url=ftp://fr2.rpmfind.net/linux/centos/6/centosplus/x86_64/Packages/kernel-firmware-2.6.32-642.1.1.el6.centos.plus.noarch.rpm mode=0644
+  get_url: dest=/home/{{ansible_ssh_user}}/kernel-firmware.rpm  url=ftp://fr2.rpmfind.net/linux/centos/6/centosplus/x86_64/Packages/kernel-firmware-2.6.32-642.13.1.el6.centos.plus.noarch.rpm mode=0644
   when: newkernel.changed
 
 - shell: rpm -if /home/{{ansible_ssh_user}}/kernel-firmware.rpm
   when: newkernel.changed
 
 - name: Update kernel
-  yum: name=kernel-debug state=latest
+  yum: name=kernel-debug-2.6.32-642.13.1.el6.x86_64 state=installed
   when: newkernel.changed
 
-- shell: grubby --set-default=/boot/vmlinuz-2.6.32-642.1.1.el6.x86_64.debug
+- shell: grubby --set-default=/boot/vmlinuz-2.6.32-642.13.1.el6.x86_64.debug
   when: newkernel.changed
 
 - shell:  sleep 2 && reboot
diff --git a/roles/mesos-master/defaults/main.yml b/roles/mesos-master/defaults/main.yml
index d139522..42c5011 100644
--- a/roles/mesos-master/defaults/main.yml
+++ b/roles/mesos-master/defaults/main.yml
@@ -1,11 +1,10 @@
 ---
-# The Marathon and Chronos framework versions
+# The Marathon framework version 
 #
 # A `*` is added after the version when installing, which permits to leave out
 # version suffixes added by Mesosphere. To install the latest use `latest`,
 # to install latest 0.13 use `0.13`.
-marathon_version: "1.1.4"
-chronos_version: "2.4.0"
+marathon_version: "1.3.8"
 
 # Name of the Mesos cluster.
 cluster_name: "Mesos Stack"
diff --git a/roles/mesos-master/tasks/main.yml b/roles/mesos-master/tasks/main.yml
index 0bc9098..2ab139f 100644
--- a/roles/mesos-master/tasks/main.yml
+++ b/roles/mesos-master/tasks/main.yml
@@ -34,10 +34,16 @@
 - name: Configure Chronos
   template: src=etc-init-chronos.conf.j2 dest=/etc/init/chronos.conf mode=0644
   notify: Restart master services
+  when: chronos_marathon_active != "yes"
+
+- name: Start chronos
+  service: name={{item}} state=started enabled=yes
+  with_items:
+    - chronos
+  when: chronos_marathon_active != "yes"
 
 - name: Start master services
   service: name={{item}} state=started enabled=yes
   with_items:
     - marathon
-    - chronos
     - mesos-master
diff --git a/roles/mesos-master/templates/etc-init-marathon.conf.j2 b/roles/mesos-master/templates/etc-init-marathon.conf.j2
index e253d80..bc90e98 100644
--- a/roles/mesos-master/templates/etc-init-marathon.conf.j2
+++ b/roles/mesos-master/templates/etc-init-marathon.conf.j2
@@ -1,4 +1,6 @@
 # {{ansible_managed}}
+# use  --mesos_authentication \ with mesos 1.x or --http_credentials "{{ mesos_http_credentials }}" \ with early versions
+
 description "Marathon scheduler for Mesos"
 
 start on runlevel [2345]
@@ -9,7 +11,7 @@ respawn limit 10 5
 
 script
 /usr/bin/marathon \
-  --http_credentials "{{ mesos_http_credentials }}" \
+  --mesos_authentication \
   --mesos_authentication_principal "{{ mesos_authentication_principal }}" \
   --mesos_authentication_secret_file "{{ mesos_authentication_secret_file }}" \
   --http_port {{marathon_port}}
diff --git a/roles/mesos/defaults/main.yml b/roles/mesos/defaults/main.yml
index 981bf36..d06fc4a 100644
--- a/roles/mesos/defaults/main.yml
+++ b/roles/mesos/defaults/main.yml
@@ -6,7 +6,7 @@
 # to leave out version suffixes added by Mesosphere. Use `apt-policy mesos` to
 # see available versions.  To install the latest use `latest`, to install most
 # recent 0.11 release use `0.11`.
-mesos_version: "0.28.2"
+mesos_version: "1.1.0"
 
 # Credentials used for framework authentication
 #
diff --git a/vagrant/hosts b/vagrant/hosts
index 992add6..9f5a266 100644
--- a/vagrant/hosts
+++ b/vagrant/hosts
@@ -6,6 +6,8 @@
 ansible_ssh_user=vagrant
 ansible_domainname=mesos.dev
 marathon_port=8080
+chronos_marathon_active="no"
+chronos_version="2.4.0"
 
 [zookeeper]
 10.141.141.10
@@ -27,4 +29,4 @@ marathon_port=8080
 
 [glusterfs]
 10.141.141.10
-10.141.141.11
\ No newline at end of file
+10.141.141.11