diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/build.yml
similarity index 100%
rename from .github/workflows/ubuntu.yml
rename to .github/workflows/build.yml
diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml
index 46c05b4..49d9949 100644
--- a/.github/workflows/docker_hub.yml
+++ b/.github/workflows/docker_hub.yml
@@ -4,8 +4,8 @@ name: Publish Docker images
 
 on:
   workflow_dispatch: # manually triggered
-#  push:
-#    branches: [ latest, stable ]
+  push:
+    branches: [ latest, stable, 24.05 ]
 
 jobs:
   push_to_registry:
@@ -35,21 +35,16 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: buster/Dockerfile
+          file: Dockerfile
           push: true
-          tags: |
-            dalibo/pandocker:${{ steps.branch.outputs.branch_name }}
-            dalibo/pandocker:${{ steps.branch.outputs.branch_name }}-buster
-            dalibo/pandocker:${{ steps.branch.outputs.branch_name }}-buster-extra
+          target: extra
+          tags: dalibo/pandocker:${{ steps.branch.outputs.branch_name }}
 
       - name: Build and push the `full` image
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: buster-full/Dockerfile
+          file: Dockerfile
           push: true
-          # The tag `xxx-full` is not officially supported, only kept for backward compat
-          tags: |
-            dalibo/pandocker:${{ steps.branch.outputs.branch_name }}-buster-full
-            dalibo/pandocker:${{ steps.branch.outputs.branch_name }}-full
-
+          target: full
+          tags: dalibo/pandocker:${{ steps.branch.outputs.branch_name }}-full
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 08e8687..c9e8464 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,15 +46,19 @@ in the repository for archiving purposes in the public interest.
 How To Release a new version
 -------------------------------------------------------------------------------
 
+Let's say you want to release version `23.07`
+
 * [ ] Close all open ticket on the current milestone
 * [ ] Create a `release` branch
 * [ ] Update the [CHANGELOG.md]()
+* [ ] Add `23.07` in `on.push.branches` in [.github/workflows/docker_hub.yml]()
 * [ ] Write a announcement in [NEWS.md]()
 * [ ] Merge the `release` branch into `latest`
-* [ ] Add a tag to `latest`
+* [ ] Add a tag `23.07` to `latest`
 * [ ] Create a new [release]
-* [ ] Rebase the `stable` branche from `latest`
-* [ ] Wait for docker hub to rebuild the images
+* [ ] Rebase the `stable` branch from `latest`
+* [ ] Create a `23.07` branch from `latest`
+* [ ] Check that github Actions is correctly publishing the images
 * [ ] Create the next milestone
 * [ ] Bump the new version on `latest`
 * [ ] Publish the announcement
diff --git a/README.md b/README.md
index 0f65e8d..dde3e2a 100644
--- a/README.md
+++ b/README.md
@@ -152,24 +152,19 @@ The full variant includes
 
 ## Supported Tags : Branch + Variant + Parent
 
-The image is available in multiple versions named as follows:
+The image is available in 4 versions named as follows:
 
-`branch[-parent[-variant]]`
+* `latest` (default): minimal image containing the most recent changes
+* `stable` : minimal image based on the latest stable release
+* `latest-full` (default): complete image containing the most recent changes
+* `stable-full` : complete image based on the latest stable release
 
-* The __branch__ can be `latest` (default) or `stable` (for production)
-  or the release name (`20.02`)
-* The __parent__ is the base image we are using. Currently only `ubuntu`
-  is supported
-* The __variant__ is either `extra` (330MB) or `full` (810 MB)
+You can also the release names for instance
 
-The supported tags are :
+`docker pull dalibo/pandocker:24.05`
 
-* `latest`, `latest-ubuntu`, `latest-ubuntu-extra` (default)
-* `latest-ubuntu-full`
-* `stable`, `stable-ubuntu`, `stable-ubuntu-extra`
-* `stable-ubuntu-full`
-
-Other tags are not supported and should be used with care.
+the previous versions add more complex tags such as `latest-ubuntu-extra` 
+or `stable-buster`. They are not supported anymore.
 
 ## Build it