diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 176ded5e..d183ea63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ merge_request:
     GIT_STRATEGY: none
   stage: build
   only:
-    - /(^new\/)|(^mig\/)|(^imp\/)|(^fix\/)/
+    - /(^add\/)|(^new\/)|(^mig\/)|(^imp\/)|(^fix\/)/i
   script:
     - docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow
     - docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow
@@ -70,7 +70,7 @@ publish:
     - ENVS=`env | grep "CI_\|GITLAB_" | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' '`
     - docker run -v $PWD:/src $ENVS flow odoo-publish -n "Hibou Odoo Suite" -v $RELEASE
   only:
-    - /^\d\d\.\d/
+    - /^\d\d\.\d+$/
 
 trigger:
   variables:
@@ -79,5 +79,5 @@ trigger:
   script:
     - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=$RELEASE $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline
   only:
-    - /^\d\d\.\d/
+    - /^\d\d\.\d+/
 
diff --git a/Dockerfile b/Dockerfile
index 2cf8895a..68724021 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,7 @@
-FROM hibou/hibou-odoo:15.0
+FROM hibou/hibou-odoo:16.0
 
-USER 0
-COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia
-RUN set -x; \
-        curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-        && apt-get install -y \
-           nodejs \
-           build-essential \
-           libsecret-1-0 \
-           procps \
-        && npm install --global yarn
-
-USER 104
+USER odoo
+COPY --from=registry.gitlab.com/hibou-io/athene /opt/athene /opt/athene
 COPY --from=hibou/flow /flow /flow
 COPY --chown=104 entrypoint.sh /entrypoint.sh
 COPY --chown=104 . /opt/odoo/hibou-suite
@@ -21,6 +11,6 @@ RUN rm /etc/odoo/odoo.conf \
 
 EXPOSE 3000
 ENV SHELL=/bin/bash \
-    THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins
+    THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins
 ENV USE_LOCAL_GIT true
 
diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab
index 0ddb71f5..c9d224c4 100644
--- a/Dockerfile-GitLab
+++ b/Dockerfile-GitLab
@@ -1,17 +1,7 @@
 FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE
 
-USER 0
-COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia
-RUN set -x; \
-        curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-        && apt-get install -y \
-           nodejs \
-           build-essential \
-           libsecret-1-0 \
-           procps \
-        && npm install --global yarn
-
-USER 104
+USER odoo
+COPY --from=registry.gitlab.com/hibou-io/athene /opt/athene /opt/athene
 COPY --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow
 COPY --chown=104 entrypoint.sh /entrypoint.sh
 COPY --chown=104 . /opt/odoo/hibou-suite
@@ -21,6 +11,6 @@ RUN rm /etc/odoo/odoo.conf \
 
 EXPOSE 3000
 ENV SHELL=/bin/bash \
-    THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins
+    THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins
 ENV USE_LOCAL_GIT true
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 2d73a291..86def03d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,23 +16,24 @@ set -e
 #    DEV_MODE_PATH=/opt/odoo/addons
 #      To change the path to start Theia in, useful to get git working.
 
+if [ "$DEV_MODE_PATH" != "" ] && [ -z "$(ls -A $DEV_MODE_PATH/.theia)" ]
+then
+   cp -R /opt/odoo/hibou-suite/.theia $DEV_MODE_PATH || true
+fi
+if [ "$DEV_MODE_PATH" != "" ] && [ -z "$(ls -A $DEV_MODE_PATH/.pylintrc)" ]
+then
+   cp -R /opt/odoo/hibou-suite/.pylintrc $DEV_MODE_PATH || true
+fi
+
 if [ "$DEV_MODE_PATH" == "" ]
 then
-   export DEV_MODE_PATH=/opt/odoo
+   export DEV_MODE_PATH=/opt/odoo/hibou-suite
 fi
-
-# setup development IDE
-if [ "$DEV_MODE" == "exclusive" ]
+if [[ -x "/opt/athene/entrypoint.sh" ]]
 then
-    cd /opt/theia
-    exec node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0
-elif [ "$DEV_MODE" != "" ]
-then
-    cd /opt/theia
-    node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0 &
+  /opt/athene/entrypoint.sh
 fi
 
-
 # set the postgres database host, port, user and password according to the environment
 # and pass them as arguments to the odoo process if not present in the config file
 : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}