diff --git a/Dockerfile b/Dockerfile
index 416b697..9785831 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,8 @@ ENV LC_ALL en_US.UTF-8
 #ENV CARTODB_VERSION=v4.11.152
 #ENV CARTODB_VERSION=v4.12.9
 #ENV CARTODB_VERSION=v4.12.26
-ENV CARTODB_VERSION=v4.12.30
+#ENV CARTODB_VERSION=v4.12.30
+ENV CARTODB_VERSION=master
 #ENV SQLAPI_VERSION=1.47.2
 ENV SQLAPI_VERSION=master
 #ENV CRANKSHAFT_VERSION=0.8.1
@@ -113,7 +114,7 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
 RUN git config --global user.email you@example.com
 RUN git config --global user.name "Your Name"
 
-# Varnish 3, Ubuntu:17.04 comes with Varnish 5.1 which can't be run with anonymous admin telnet
+# Varnish 3, Ubuntu:18.04 comes with Varnish 5.1 which can't be run with anonymous admin telnet
 RUN cd /opt && \
     wget http://varnish-cache.org/_downloads/varnish-3.0.7.tgz && \
     tar -zxf varnish-3.0.7.tgz && \
diff --git a/config/app_config.yml b/config/app_config.yml
index d1db4e9..35e3410 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml
@@ -85,46 +85,46 @@ defaults: &defaults
     api_key:
   passwords:
     expiration_in_d:
-  metrics:
-    hubspot:
-      events_host: ''
-      token: ''
-      form_ids:
-        newsletter: ''
-      event_ids:
-        import_failed: ''
-        geocoding_failed: ''
-        import_success: ''
-        geocoding_success: ''
-        published_visualization: ''
-        visited_dashboard: ''
-        connect_dataset: ''
-        create_map: ''
-        export_table: ''
-        export_map: ''
-        export_public_map: ''
-        select_wms: ''
-        color_basemap: ''
-        pattern_basemap: ''
-        geocoding: ''
-        visual_merge: ''
-        common_data: ''
-        cartocss_manually: ''
-        wizard: ''
-        filter: ''
-        query: ''
-        applied_sql: ''
-        applied_cartocss: ''
-        modified_style_form: ''
-        completed_connection: ''
-        failed_connection: ''
-        created_analysis: ''
-        modified_analysis: ''
-        published_map: ''
-        exported_map: ''
-      mailing_track:
-        like_map: ''
-        trending_map: ''
+  # metrics:
+  #   hubspot:
+  #     events_host: ''
+  #     token: ''
+  #     form_ids:
+  #       newsletter: ''
+  #     event_ids:
+  #       import_failed: ''
+  #       geocoding_failed: ''
+  #       import_success: ''
+  #       geocoding_success: ''
+  #       published_visualization: ''
+  #       visited_dashboard: ''
+  #       connect_dataset: ''
+  #       create_map: ''
+  #       export_table: ''
+  #       export_map: ''
+  #       export_public_map: ''
+  #       select_wms: ''
+  #       color_basemap: ''
+  #       pattern_basemap: ''
+  #       geocoding: ''
+  #       visual_merge: ''
+  #       common_data: ''
+  #       cartocss_manually: ''
+  #       wizard: ''
+  #       filter: ''
+  #       query: ''
+  #       applied_sql: ''
+  #       applied_cartocss: ''
+  #       modified_style_form: ''
+  #       completed_connection: ''
+  #       failed_connection: ''
+  #       created_analysis: ''
+  #       modified_analysis: ''
+  #       published_map: ''
+  #       exported_map: ''
+  #     mailing_track:
+  #       like_map: ''
+  #       trending_map: ''
   common_data:
     protocol: 'https'
     username: 'common-data'
diff --git a/setup_organization.sh b/setup_organization.sh
index 70042b9..f0a8ad7 100644
--- a/setup_organization.sh
+++ b/setup_organization.sh
@@ -13,3 +13,5 @@ bundle exec rake cartodb:db:configure_geocoder_extension_for_organizations[$ORGA
 echo "UPDATE users SET sync_tables_enabled=true WHERE username='${USERNAME}'" | psql -U postgres -t carto_db_development
 # Enable private maps
 echo "UPDATE users SET private_maps_enabled = 't'" | psql -U postgres -t carto_db_development
+
+bundle exec rake cartodb:features:enable_feature_for_all_users["new_dashboard"]