diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
index f068b863..70fb1e17 100644
--- a/.github/workflows/on_pull_request.yml
+++ b/.github/workflows/on_pull_request.yml
@@ -72,7 +72,7 @@ jobs:
         uses: al-cheb/configure-pagefile-action@v1.2
       - name: Native Image for CLI
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
           gradlew.bat :cli:shadowJar :cli:nativeImage
         shell: cmd
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/on_push_master.yml b/.github/workflows/on_push_master.yml
index 84eff484..62a84af9 100644
--- a/.github/workflows/on_push_master.yml
+++ b/.github/workflows/on_push_master.yml
@@ -11,8 +11,8 @@ jobs:
       - name: Docker Login
         uses: docker/login-action@v1.8.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.MICHELIN_DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.MICHELIN_DOCKER_HUB_PASSWD }}
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
@@ -74,7 +74,7 @@ jobs:
         uses: al-cheb/configure-pagefile-action@v1.2
       - name: Native Image for CLI
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
           gradlew.bat :cli:shadowJar :cli:nativeImage
         shell: cmd
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/on_push_tag.yml b/.github/workflows/on_push_tag.yml
index 7f6104e8..3a58007e 100644
--- a/.github/workflows/on_push_tag.yml
+++ b/.github/workflows/on_push_tag.yml
@@ -11,8 +11,8 @@ jobs:
       - name: Docker Login
         uses: docker/login-action@v1.8.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.MICHELIN_DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.MICHELIN_DOCKER_HUB_PASSWD }}
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
@@ -77,7 +77,7 @@ jobs:
         uses: al-cheb/configure-pagefile-action@v1.2
       - name: Native Image for CLI
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
           gradlew.bat :cli:shadowJar :cli:nativeImage
         shell: cmd
       - uses: actions/upload-artifact@v2
diff --git a/README.md b/README.md
index 41f83a9d..ff1eba36 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ ns4kafka
 [![GitHub issues](https://img.shields.io/github/issues/michelin/ns4kafka)](https://github.com/michelin/ns4kafka/issues)
 [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=michelin_ns4kafka&metric=coverage)](https://sonarcloud.io/component_measures/metric/coverage/list?id=michelin_ns4kafka)
 [![SonarCloud Bugs](https://sonarcloud.io/api/project_badges/measure?project=michelin_ns4kafka&metric=bugs)](https://sonarcloud.io/component_measures/metric/reliability_rating/list?id=michelin_ns4kafka)
-[![Docker Pulls](https://img.shields.io/docker/pulls/twobeeb/ns4kafka?label=ns4kafka%20pulls&logo=Docker)](https://hub.docker.com/r/twobeeb/ns4kafka/tags)
-[![Docker Pulls](https://img.shields.io/docker/pulls/twobeeb/kafkactl?label=kafkactl%20pulls&logo=Docker)](https://hub.docker.com/r/twobeeb/kafkactl/tags)
+[![Docker Pulls](https://img.shields.io/docker/pulls/michelin/ns4kafka?label=ns4kafka%20pulls&logo=Docker)](https://hub.docker.com/r/michelin/ns4kafka/tags)
+[![Docker Pulls](https://img.shields.io/docker/pulls/michelin/kafkactl?label=kafkactl%20pulls&logo=Docker)](https://hub.docker.com/r/michelin/kafkactl/tags)
 
 # Table of Contents
 * [About the project](#about-the-project)
@@ -347,7 +347,7 @@ Download the latest available version from the [Releases](https://github.com/mic
 - ``kafkactl`` binary for Linux
 - ``kafkactl.exe`` binary for Windows
 - ``kafkactl.jar`` java package
-- Docker image from DockerHub [twobeeb/kafkactl](https://hub.docker.com/repository/docker/twobeeb/kafkactl)
+- Docker image from DockerHub [michelin/kafkactl](https://hub.docker.com/repository/docker/michelin/kafkactl)
 
 Windows and Linux binaries are generated using GraalVM and native-image.  
 Java package requires at least Java 11.  
diff --git a/api/build.gradle b/api/build.gradle
index 4a200238..2d66b695 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -61,7 +61,7 @@ tasks.withType(JavaCompile) {
 }
 
 run {
-//    environment( "MICRONAUT_ENVIRONMENTS","dev")
+    environment( "MICRONAUT_ENVIRONMENTS","dev")
 }
 
 test {
@@ -71,7 +71,7 @@ test {
 }
 
 dockerBuild {
-    images = ["twobeeb/ns4kafka:"+version]
+    images = ["michelin/ns4kafka:"+version]
 }
 
 jacocoTestReport {
diff --git a/cli/build.gradle b/cli/build.gradle
index d2a8d3dc..bb12c3e5 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -61,7 +61,7 @@ nativeImage {
             '-H:Log=*ShimDLL:3,link:3,copy:3']
 }
 dockerBuild {
-    images = ["twobeeb/kafkactl:"+version]
+    images = ["michelin/kafkactl:"+version]
 }
 
 jacocoTestReport {