diff --git a/Dockerfile b/Dockerfile
index 77d00d5..101f6ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -178,28 +178,20 @@ RUN git clone https://github.com/CartoDB/Windshaft-cartodb.git && \
     mkdir logs
 
 # Install CartoDB
-RUN git clone https://git.kongjian.xin:8443/cartodb/cartodb-4.29.git cartodb && \
+RUN git clone --recursive https://github.com/CartoDB/cartodb.git && \
     cd cartodb && \
+    git checkout $CARTODB_VERSION && \
     # Install cartodb extension
-    cd lib && \
-    git clone https://github.com/CartoDB/cartodb-postgresql.git sql && \
-    cd sql && \
-    git checkout 667ec0e32c && \
+    cd lib/sql && \
     PGUSER=postgres make install && \
     service postgresql start && /bin/su postgres -c \
-      /tmp/cartodb_pgsql.sh && service postgresql stop 
-      
-RUN cd /cartodb && npm install 
-#    rm -r /tmp/npm-* /root/.npm && \
-
-#RUN cd /cartodb && \
-#    perl -pi -e 's/gdal==1\.10\.0/gdal==2.2.2/' python_requirements.txt && \
-#    pip install --no-binary :all: -r python_requirements.txt 
-#    pip install python_requirements.txt 
-
-RUN cd /cartodb && \
-    gem install bundler --version=1.17.3 && \
-    gem install compass archive-tar-minitar rack && \
+      /tmp/cartodb_pgsql.sh && service postgresql stop && \
+    cd - && \
+    npm install && \
+    rm -r /tmp/npm-* /root/.npm && \
+    perl -pi -e 's/gdal==1\.10\.0/gdal==2.2.2/' python_requirements.txt && \
+    pip install --no-binary :all: -r python_requirements.txt && \
+    gem install bundler --version=1.17.3 && gem install compass archive-tar-minitar rack && \
     bundle update thin && \
     /bin/bash -l -c 'bundle install' && \
     cp config/grunt_development.json ./config/grunt_true.json && \