diff --git a/Dockerfile b/Dockerfile
index 923878fd7a08..22182552a686 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,14 @@
-FROM node:12
+FROM node:14
 
 MAINTAINER Format team <innov-format@teads.tv>
 
-RUN yarn global add gulp-cli
-
 ADD . /var/www
 WORKDIR /var/www
 
-RUN yarn
+RUN npm i gulp
+RUN amp build
 
-RUN gulp build
 
 EXPOSE 8000
 
-CMD gulp serve --host=0.0.0.0
+CMD amp serve
diff --git a/test.sh b/test.sh
index c29e2546a5c1..5460d670ff91 100755
--- a/test.sh
+++ b/test.sh
@@ -24,7 +24,7 @@ chmod g+s .
 # currently the result is not pushed because it will trigger the same job, infinite ci loop
 git remote add upstream git@github.com:ampproject/amphtml.git || echo 'upstream already present'
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 
 git submodule init
 git submodule update