diff --git a/config/devstack/local.sh b/config/devstack/local.sh
index 0f096a5b..cf728d1a 100755
--- a/config/devstack/local.sh
+++ b/config/devstack/local.sh
@@ -34,7 +34,7 @@ UBUNTU_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_u12.qcow2
 CENTOS_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_c6.6.qcow2
 SPARK_1_0_0_IMAGE_PATH=/home/ubuntu/images/spark_1.0.0_u14.qcow2
 SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.qcow2
-MAPR_4_0_2_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_4.0.2.mrv2_u14.qcow2
+MAPR_5_0_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.0.0.mrv2_u14.qcow2
 UBUNTU_12_04_IMAGE_PATH=/home/ubuntu/images/ubuntu-12.04-server-cloudimg-amd64-disk1.img
 
 # setup ci tenant and ci users
@@ -84,7 +84,7 @@ glance image-create --name $(basename -s .qcow2 $UBUNTU_CDH_5_4_0_IMAGE_PATH) --
 glance image-create --name $(basename -s .qcow2 $CENTOS_CDH_5_4_0_IMAGE_PATH) --file $CENTOS_CDH_5_4_0_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.4.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="cloud-user"
 glance image-create --name $(basename -s .qcow2 $SPARK_1_0_0_IMAGE_PATH) --file $SPARK_1_0_0_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.0.0'='True'  --property '_sahara_username'="ubuntu"
 glance image-create --name $(basename -s .qcow2 $SPARK_1_3_1_IMAGE_PATH) --file $SPARK_1_3_1_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.3.1'='True'  --property '_sahara_username'="ubuntu"
-glance image-create --name $(basename -s .qcow2 $MAPR_4_0_2_MRV2_IMAGE_PATH) --file $MAPR_4_0_2_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_4.0.2.mrv2'='True'  --property '_sahara_username'="ubuntu"
+glance image-create --name $(basename -s .qcow2 $MAPR_5_0_0_MRV2_IMAGE_PATH) --file $MAPR_5_0_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_4.0.2.mrv2'='True'  --property '_sahara_username'="ubuntu"
 glance image-create --name ubuntu-test-image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare
 glance image-create --name fake_image --file $UBUNTU_12_04_IMAGE_PATH  --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_fake'='True' --property '_sahara_tag_0.1'='True' --property '_sahara_username'='ubuntu'
 glance image-update --name ubuntu-12.04 --property '_sahara_tag_ci'='True' ubuntu-12.04-server-cloudimg-amd64-disk1
diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index 18e68d5c..dd8c4ef9 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -33,7 +33,7 @@ projects:
       - gate-sahara-neutron-direct-spark_1.3.1-u14-aio
       - gate-sahara-neutron-direct-transient-u14
       - gate-sahara-neutron-heat-transient-u14
-      - gate-sahara-neutron-heat-mapr_4.0.2.mrv2-u14
+      - gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14
       - gate-sahara-nova-direct-cdh_5.3.0-u12-aio
       - gate-sahara-nova-direct-cdh_5.3.0-c6.6-aio
       - gate-sahara-nova-direct-cdh_5.4.0-u12-aio
@@ -56,7 +56,7 @@ projects:
       - dib-neutron-heat-vanilla_2.7.1-u14
       - dib-neutron-heat-vanilla_2.7.1-c6.6
       - dib-neutron-heat-vanilla_2.7.1-c7
-      - dib-neutron-heat-mapr_4.0.2.mrv2-u14
+      - dib-neutron-heat-mapr_5.0.0.mrv2-u14
       - dib-neutron-direct-spark_1.0.0-u14-aio
       - dib-neutron-direct-spark_1.3.1-u14-aio
       - dib-nova-heat-hdp_2.0.6-c6.6
@@ -71,7 +71,7 @@ projects:
       - dib-neutron-heat-vanilla_2.7.1-u14
       - dib-neutron-heat-vanilla_2.7.1-c6.6
       - dib-neutron-heat-vanilla_2.7.1-c7
-      - dib-neutron-heat-mapr_4.0.2.mrv2-u14
+      - dib-neutron-heat-mapr_5.0.0.mrv2-u14
       - dib-neutron-direct-spark_1.0.0-u14-aio
       - dib-neutron-direct-spark_1.3.1-u14-aio
       - dib-nova-heat-hdp_2.0.6-c6.6
@@ -100,7 +100,7 @@ jobs:
       - all-files-match-any:
           - ^doc/.*$
           - ^.*\.rst$
-  - name: ^.*-mapr_4.0.2.mrv2-u14$
+  - name: ^.*-mapr_5.0.0.mrv2-u14$
     branch: master
     voting: false
   - name: ^.*-cdh_5.3.0-.*$
diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml
index 829e34de..18841b0d 100644
--- a/jenkins_job_builder/diskimage.yaml
+++ b/jenkins_job_builder/diskimage.yaml
@@ -57,7 +57,7 @@
             - spark_1.3.1
           os: u14
      - 'dib-{network}-{engine}-{plugin}-{os}':
-          plugin: mapr_4.0.2.mrv2
+          plugin: mapr_5.0.0.mrv2
           os: u14
      - 'dib-{network}-{engine}-{plugin}-{os}':
           network: nova
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index af9cff6a..6d1daf95 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -79,7 +79,7 @@
              - vanilla_2.6.0
              - vanilla_2.7.1
              - transient
-             - mapr_4.0.2.mrv2
+             - mapr_5.0.0.mrv2
           os: u14
           network: neutron
      - 'gate-sahara-{network}-{engine}-{plugin}-{os}':
diff --git a/slave-scripts/dib.sh b/slave-scripts/dib.sh
index 4c2d7895..3010a6df 100755
--- a/slave-scripts/dib.sh
+++ b/slave-scripts/dib.sh
@@ -115,13 +115,13 @@ case $plugin in
        template_image_prefix="ambari_2_1"
     ;;
 
-    mapr_4.0.2.mrv2)
-       env mapr_ubuntu_image_name=${mapr_4_0_2_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
-       check_error_code $? ${mapr_4_0_2_mrv2_image}.qcow2
-       upload_image "${plugin}" "${username}" ${mapr_4_0_2_mrv2_image}
+    mapr_5.0.0.mrv2)
+       env mapr_ubuntu_image_name=${mapr_5_0_0_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
+       check_error_code $? ${mapr_5_0_0_mrv2_image}.qcow2
+       upload_image "${plugin}" "${username}" ${mapr_5_0_0_mrv2_image}
        mode=distribute
-       scenario_conf_file="$sahara_templates_path/mapr-4.0.2.mrv2.yaml.mako"
-       template_image_prefix="mapr_402mrv2"
+       scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
+       template_image_prefix="mapr_500mrv2"
     ;;
 esac
 
diff --git a/slave-scripts/functions-dib.sh b/slave-scripts/functions-dib.sh
index 349ed928..00ff28a0 100755
--- a/slave-scripts/functions-dib.sh
+++ b/slave-scripts/functions-dib.sh
@@ -78,8 +78,8 @@ upload_image() {
            spark_1.3.1)
              image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.3.1=True --property _sahara_username=${username}"
            ;;
-           mapr_4.0.2.mrv2)
-             image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_4.0.2.mrv2=True --property _sahara_username=${username}"
+           mapr_5.0.0.mrv2)
+             image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=True --property _sahara_username=${username}"
            ;;
    esac
    register_new_image "$image" "$image_properties"
diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh
index 33141bd4..804ffd9c 100755
--- a/slave-scripts/gate-sahara.sh
+++ b/slave-scripts/gate-sahara.sh
@@ -71,10 +71,10 @@ case $plugin in
        scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako"
        template_image_prefix="spark_1_3"
        ;;
-    mapr_4.0.2.mrv2)
+    mapr_5.0.0.mrv2)
        mode=distribute
-       scenario_conf_file="$sahara_templates_path/mapr-4.0.2.mrv2.yaml.mako"
-       template_image_prefix="mapr_402mrv2"
+       scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
+       template_image_prefix="mapr_500mrv2"
        ;;
     fake)
        mode=distribute