diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 22e364a9..10caa2a8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,12 +12,15 @@ env:
   NODE_VERSION: '12.18.3'
 
 jobs:
-  build-node:
+  build-and-test:
     runs-on: ubuntu-18.04
     timeout-minutes: 10
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
+        token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }}
 
     - name: Setup gcloud authentication
       uses: google-github-actions/setup-gcloud@master
@@ -61,7 +64,7 @@ jobs:
       run: |
           echo ${GITHUB_SHA::7}
           echo ${GITHUB_REF##*/}
-          docker build -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} .
+          docker build -f private/Dockerfile -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} .
           
     - name: Upload image
       run: |
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 99dfa774..0e913143 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -13,18 +13,21 @@ env:
   ARTIFACTS_PROJECT_ID: cartodb-on-gcp-main-artifacts
 
 jobs:
-  build-node:
+  build-master:
     runs-on: ubuntu-18.04
     timeout-minutes: 5
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
+        token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }}
 
     - name: Build image
       run: |
           echo ${GITHUB_SHA::7}
           echo ${GITHUB_REF##*/}
-          docker build -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} .
+          docker build -f private/Dockerfile -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} .
           
     - name: Setup gcloud authentication
       uses: google-github-actions/setup-gcloud@master
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..4b13029c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "private"]
+	path = private
+	url = git@github.com:CartoDB/CartoDB-SQL-API-private.git
+	branch = master
diff --git a/private b/private
new file mode 160000
index 00000000..2e20a0f0
--- /dev/null
+++ b/private
@@ -0,0 +1 @@
+Subproject commit 2e20a0f0206fe7121162ef2db2ea292d971aabf0