diff --git a/defaults/init.yml b/defaults/init.yml
index cc439ce..e657bbd 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -7,6 +7,7 @@
 
 classes:
 - system.defaults.linux_system_repo
+- system.defaults.stacklight
 parameters:
   _param:
     mcp_version: stable
@@ -17,3 +18,4 @@
     # Other
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+    linux_repo_contrail_version: 3.0
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index f18b02e..773bebd 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -57,9 +57,13 @@
     linux_system_repo_update_mirantis_openstack_url: ${_param:linux_system_repo_update_url}/openstack-${_param:openstack_version}/
     linux_system_repo_hotfix_mirantis_openstack_url: ${_param:linux_system_repo_hotfix_url}/openstack-${_param:openstack_version}/
     #
-    linux_system_repo_opencontrail_url: ${_param:linux_system_repo_url}/opencontrail-${_param:opencontrail_version}/
-    linux_system_repo_update_opencontrail_url: ${_param:linux_system_repo_update_url}/opencontrail-${_param:opencontrail_version}/
-    linux_system_repo_hotfix_opencontrail_url: ${_param:linux_system_repo_hotfix_url}/opencontrail-${_param:opencontrail_version}/
+    linux_system_repo_opencontrail_url: ${_param:linux_system_repo_url}/opencontrail-${_param:linux_repo_contrail_version}/
+    linux_system_repo_update_opencontrail_url: ${_param:linux_system_repo_update_url}/opencontrail-${_param:linux_repo_contrail_version}/
+    linux_system_repo_hotfix_opencontrail_url: ${_param:linux_system_repo_hotfix_url}/opencontrail-${_param:linux_repo_contrail_version}/
+    #
+    linux_system_repo_opencontrail_ocata_url: ${_param:linux_system_repo_url}/oc-ocata/
+    linux_system_repo_update_opencontrail_ocata_url: ${_param:linux_system_repo_update_url}/oc-ocata/
+    linux_system_repo_hotfix_opencontrail_ocata_url: ${_param:linux_system_repo_hotfix_url}/oc-ocata/
     #
     linux_system_repo_ubuntu_url: ${_param:linux_system_repo_url}/ubuntu/
     linux_system_repo_update_ubuntu_url: ${_param:linux_system_repo_update_url}/ubuntu/
diff --git a/defaults/stacklight.yml b/defaults/stacklight.yml
new file mode 100644
index 0000000..1abbb5e
--- /dev/null
+++ b/defaults/stacklight.yml
@@ -0,0 +1,5 @@
+parameters:
+  _param:
+    # ELK stack versions
+    elasticsearch_version: 5
+    kibana_version: 5