diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2d8394c..3d80369 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,17 @@
 zoomdata-formula
 ================
 
+3.7.0 (2018-11-20) **The Zoomdata 3.7 has become Long Term Supported release**
+
+- Updated defaults to match the Zoomdata 3.7.0 recommended installation options
+- Fixed ``zoomdata-consul`` service upgrade
+- The ``zoomdata-edc-tez`` services has been deprecated and replaced with
+  ```zoomdata-edc-hive`` (generic Hive datasource connector)
+- Fixed the example of ``zoomdata-admin-server`` service properties
+- Added the example of ElasticSearch backend configuration for
+  ``zoomdata-tracing-server`` service
+- Updated MySQL JDBC driver URL in the example
+
 2.6.23 (2018-11-19) **The end of Active Support for the Zoomdata release 2.6**
 
 - The Zoomdata 2.6 Long Term Support release has stopped receiving bugfixes.
diff --git a/VERSION b/VERSION
index fef250d..7c69a55 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.23
+3.7.0
diff --git a/pillar.example b/pillar.example
index e458139..f2947e3 100644
--- a/pillar.example
+++ b/pillar.example
@@ -28,7 +28,7 @@ zoomdata:
   gpgkey: 'https://repo.zoomdata.com/ZOOMDATA-GPG-KEY.pub'
   # Repository branch from which the packages would be installed.
   # This would be overridden by ``ZOOMDATA_RELEASE`` environment variable.
-  release: 3.6
+  release: 3.7
 
   # Additional repositories under the ``base_url`` to get packages from
   repositories:
@@ -62,10 +62,10 @@ zoomdata:
   # This would be overridden by ``ZOOMDATA_VERSION`` environment variable.
   {%- if grains['os'] == 'Ubuntu' %}
   # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-  #version: "3.6.0-10+{{ grains['oscodename'] }}.stable"
+  #version: "3.7.0-3+{{ grains['oscodename'] }}.stable"
   {%- else %}
   # Packages version for RHEL/CentOS systems
-  #version: '3.6.0'
+  #version: '3.7.0'
   {%- endif %}
 
   # Zoomdata core packages to install
@@ -84,10 +84,10 @@ zoomdata:
     # This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
     {%- if grains['os'] == 'Ubuntu' %}
     # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-    #version: "3.6.0-3+{{ grains['oscodename'] }}.stable"
+    #version: "3.7.0-2+{{ grains['oscodename'] }}.stable"
     {%- else %}
     # Packages version for RHEL/CentOS systems
-    #version: '3.6.0'
+    #version: '3.7.0'
     {%- endif %}
 
     # Zoomdata EDC (datasource connector) packages to install
@@ -103,10 +103,10 @@ zoomdata:
       - zoomdata-edc-elasticsearch-5.0
       # The ElasticSearch 6.0 connector was added in Zoomdata 2.6.3
       - zoomdata-edc-elasticsearch-6.0
-      - zoomdata-edc-impala
-      # The generic Hive connector is going to be added in Zoomdata 3.7.0
+      # The generic Hive connector was added in Zoomdata 3.7.0 version.
       # COMMENT OUT FOR EARLIER RELEASES. Use the ``zoomdata-edc-tez`` package.
       - zoomdata-edc-hive
+      - zoomdata-edc-impala
       - zoomdata-edc-memsql
       - zoomdata-edc-mongo
       - zoomdata-edc-mssql
@@ -117,7 +117,7 @@ zoomdata:
       - zoomdata-edc-redshift
       - zoomdata-edc-rts
       - zoomdata-edc-sparksql
-      # The Hive-on-Tez connector is going to be deprecated in Zoomdata 3.7.0
+      # The Hive-on-Tez connector was deprecated in Zoomdata 3.7.0
       #- zoomdata-edc-tez
 
     # Install JDBC jar drivers which are not packaged with Zoomdata connectors.
@@ -139,10 +139,10 @@ zoomdata:
     # This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
     {%- if grains['os'] == 'Ubuntu' %}
     # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-    #version: "3.6.0-1+{{ grains['oscodename'] }}.stable"
+    #version: "3.7.0-1+{{ grains['oscodename'] }}.stable"
     {%- else %}
     # Packages version for RHEL/CentOS systems
-    #version: '3.6.0'
+    #version: '3.7.0'
     {%- endif %}
 
     # Zoomdata microservice packages to install
@@ -355,7 +355,7 @@ zoomdata:
     # The ElasticSearch 1.7 connector was deprecated in Zoomdata 2.6.1
     #- zoomdata-edc-elasticsearch-1.7
     # The ElasticSearch 2.0 connector was deprecated in Zoomdata 2.6.5
-    # - zoomdata-edc-elasticsearch-2.0
+    #- zoomdata-edc-elasticsearch-2.0
     - zoomdata-edc-elasticsearch-5.0
     # The ElasticSearch 6.0 connector was added in Zoomdata 2.6.3
     - zoomdata-edc-elasticsearch-6.0
@@ -373,7 +373,7 @@ zoomdata:
     #- zoomdata-edc-redshift
     - zoomdata-edc-rts
     - zoomdata-edc-sparksql
-    # The Hive-on-Tez connector is going to be deprecated in Zoomdata 3.7.0
+    # The Hive-on-Tez connector was deprecated in Zoomdata 3.7.0
     #- zoomdata-edc-tez
 
     # Former "microservices". These are flat file support services, i.e. used
@@ -384,14 +384,14 @@ zoomdata:
     - zoomdata-stream-writer-postgresql
     - zoomdata-upload-service
 
-    # Zoomdata core
-    - zoomdata-query-engine
-    - zoomdata-scheduler
-
     # The X framebuffer was deprecated in Zoomdata 3.1 release. New screenshot
     # service was introduced instead.
     #- zoomdata-xvfb
-    - zoomdata-screenshot-service
+    #- zoomdata-screenshot-service
+
+    # Zoomdata core
+    - zoomdata-query-engine
+    - zoomdata-scheduler
 
     # The admin service based on Spring Boot Admin is available since
     # Zoomdata 3.5 release. This is optional and disabled by default.
diff --git a/zoomdata/defaults.yaml b/zoomdata/defaults.yaml
index 01a4eb9..b1aa94a 100644
--- a/zoomdata/defaults.yaml
+++ b/zoomdata/defaults.yaml
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Default variables for the Zoomdata LTS 2.6 release deployment
+# Default variables for the Zoomdata LTS 3.7 release deployment
 
 zoomdata:
   # Constants
@@ -12,7 +12,7 @@ zoomdata:
   # Defaults which could be overridden in Pillar
   base_url: 'http://repo.zoomdata.com'
   gpgkey: 'https://repo.zoomdata.com/ZOOMDATA-GPG-KEY.pub'
-  release: '2.6'
+  release: '3.7'
   repositories:
     - tools
   components:
@@ -29,7 +29,6 @@ zoomdata:
     - zoomdata-consul
     - zoomdata-query-engine
     - zoomdata-scheduler
-    - zoomdata-xvfb
 
   edc:
     #version: 'latest'
@@ -38,6 +37,7 @@ zoomdata:
       - zoomdata-edc-cloudera-search
       - zoomdata-edc-elasticsearch-5.0
       - zoomdata-edc-elasticsearch-6.0
+      - zoomdata-edc-hive
       - zoomdata-edc-impala
       - zoomdata-edc-memsql
       - zoomdata-edc-mongo
@@ -49,7 +49,6 @@ zoomdata:
       - zoomdata-edc-redshift
       - zoomdata-edc-rts
       - zoomdata-edc-sparksql
-      - zoomdata-edc-tez
 
     jdbc:
       drivers: {}
@@ -58,6 +57,7 @@ zoomdata:
   microservices:
     #version: 'latest'
     packages:
+      - zoomdata-screenshot-service
       - zoomdata-stream-writer
       - zoomdata-upload-service
 
@@ -108,12 +108,6 @@ zoomdata:
       merge: True
       update: False
       discard: True
-    zoomdata-spark-proxy:
-      path: '/etc/zoomdata/spark-proxy.properties'
-      properties: {}
-      merge: True
-      update: False
-      discard: True
 
   tls:
     name: zoomdata
@@ -124,6 +118,7 @@ zoomdata:
     - zoomdata-edc-cloudera-search
     - zoomdata-edc-elasticsearch-5.0
     - zoomdata-edc-elasticsearch-6.0
+    - zoomdata-edc-hive
     - zoomdata-edc-impala
     #- zoomdata-edc-memsql
     - zoomdata-edc-mongo
@@ -135,13 +130,12 @@ zoomdata:
     #- zoomdata-edc-redshift
     - zoomdata-edc-rts
     - zoomdata-edc-sparksql
-    - zoomdata-edc-tez
+    #- zoomdata-screenshot-service
+    - zoomdata-stream-writer-postgresql
+    - zoomdata-upload-service
     - zoomdata-query-engine
     - zoomdata-scheduler
-    - zoomdata-stream-writer
-    - zoomdata-upload-service
     - zoomdata
-    #- zoomdata-xvfb
 
   setup:
     timeout: 900