diff --git a/Dockerfile b/Dockerfile
index b06cb7a..7de2bfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -191,8 +191,12 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s
 RUN mkdir -p /cartodb/log && touch /cartodb/log/users_modifications
 RUN service postgresql start && service redis-server start && \
 	bash -l -c "cd /cartodb && bash script/create_dev_user || bash script/create_dev_user && bash script/setup_organization.sh" && \
+# Enable CARTO Builder    
+#    bundle exec rake cartodb:features:enable_feature_for_all_users['editor-3'] && \
+#    bundle exec rake cartodb:features:enable_feature_for_all_users['explore_site']" && \
 	service postgresql stop && service redis-server stop
 
+
 EXPOSE 3000 8080 8181
 
 ENV GDAL_DATA /usr/share/gdal/1.10
diff --git a/setup_organization.sh b/setup_organization.sh
index 79b4cf0..a7d0273 100644
--- a/setup_organization.sh
+++ b/setup_organization.sh
@@ -1,8 +1,8 @@
 cd /cartodb
 source /usr/local/rvm/scripts/rvm
 
-echo "insert into feature_flags (id,name, restricted) VALUES (1, 'heatmaps', false);" | psql -U postgres carto_db_development
-echo "insert into feature_flags (id,name, restricted) VALUES (2, 'georef_disabled', false);" | psql -U postgres carto_db_development
+echo "INSERT INTO feature_flags (id,name, restricted) VALUES (nextval('machine_added_feature_flags_id_seq'), 'editor-3', false);" | psql -U postgres carto_db_development && \
+echo "INSERT INTO feature_flags (id,name, restricted) VALUES (nextval('machine_added_feature_flags_id_seq'), 'explore_site', false);" | psql -U postgres carto_db_development && \
 
 ORGANIZATION_NAME="example"
 USERNAME="admin4example"