diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bc42fe1f44d71b84fb7df7a3c36eec5559b3896..c82de7fe4660b22bdeafba9b372db155c7b85c5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,8 @@ jobs:
       #  uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          driver: docker
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
diff --git a/Dockerfile b/Dockerfile
index aeb77ab8221f659922f984d6f0331552a8a641b2..9bb874d24d51e7bdc4956e657a6cd32f731b2d5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,10 @@ ARG DOCKER_CONFIG="/usr/local/lib/docker/cli-plugins"
 
 USER root
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
 # Copy the list artefacts to install
 # Ubuntu and PIP packages, ...
 COPY Artefacts/ /tmp/Artefacts/
diff --git a/build.sh b/build.sh
index 568ca2d69ea1f57eaa2fc20450f878a443392f52..09c734d9d865ea0a82070cf84b67e8b3848b142d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,12 +1 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-. ${DIR}/env.sh
-
-#DOCKER_BUILDKIT=1 docker build \
-docker buildx build \
-	--file Dockerfile \
-	-t ${BASE}:$SHA \
-	`[[ "$BRANCH" != "master" ]] && echo -t ${BASE}:$BRANCH` \
-	`[[ "$BRANCH" == "master" ]] && echo -t ${BASE}:latest` $@ \
-	 .
+docker build --progress=plain -t brunoe/jupyter-base:develop .
diff --git a/env.sh b/env.sh
deleted file mode 100755
index 8f244eed68f2b41f13e36051aa72c0d5205ef2bc..0000000000000000000000000000000000000000
--- a/env.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-REGISTRY=brunoe
-IMAGE_NAME=${PWD##*/}
-
-CURRENT=`pwd`
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cd $DIR
-BASE=${REGISTRY}/${IMAGE_NAME}
-BRANCH=`git rev-parse --abbrev-ref HEAD|tr '/' '_' `
-SHA=`git log -1 --pretty=%h`
-cd $CURRENT
diff --git a/push.sh b/push.sh
deleted file mode 100755
index a62f4e75c9d80048590eb9db5c31be6d484cf3af..0000000000000000000000000000000000000000
--- a/push.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-echo $DIR
-. ${DIR}/env.sh
-
-BASE=${REGISTRY}/${IMAGE_NAME}
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-
-echo Branche:$BRANCH
-docker push ${BASE} --all-tags
-