diff --git a/.github/workflows/test-on-kube.yml b/.github/workflows/test-on-kube.yml
index eaa350f2..6a95beae 100644
--- a/.github/workflows/test-on-kube.yml
+++ b/.github/workflows/test-on-kube.yml
@@ -30,11 +30,6 @@ jobs:
           wait: 60s
           verbosity: 2
 
-      - name: Set up Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.11.2
-
       - name: Set up ingress controller 
         run: |
           helm repo add traefik https://traefik.github.io/charts && helm repo update
@@ -50,17 +45,17 @@ jobs:
         run: |
           TAG=$(make get-current-tag) BUILD_TARGET=test docker-compose -f docker-compose-prod.yml build
           kind load docker-image \
-            basegun-backend:$(make get-current-tag)-prod \
-            basegun-frontend:$(make get-current-tag)-prod \
+            basegun-backend:$(make get-current-tag) \
+            basegun-frontend:$(make get-current-tag) \
             --name basegun-testing
           helm upgrade --install basegun ./infra/kube/helm/  \
             --set ingress.hosts[0].host="$LOCAL_DOMAIN" \
             --set ingress.hosts[0].paths[0].path="/" \
             --set ingress.hosts[0].paths[0].pathType="Prefix"  \
             --set backend.image.repository="basegun-backend" \
-            --set backend.image.tag="$(make get-current-tag)-prod" \
+            --set backend.image.tag="$(make get-current-tag)" \
             --set frontend.image.repository="basegun-frontend" \
-            --set frontend.image.tag="$(make get-current-tag)-prod" \
+            --set frontend.image.tag="$(make get-current-tag)" \
             --set backend.secret.create="true" \
             --set-string backend.secret.values.AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" \
             --set-string backend.secret.values.AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" \
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index afd2f375..f318531b 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -14,7 +14,7 @@ services:
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - WORKSPACE=${WORKSPACE:-prod}
-    image: basegun-backend:${TAG}-prod
+    image: basegun-backend:${TAG}
     ports:
       - 5000:5000
 
@@ -23,6 +23,6 @@ services:
       context: ./frontend
       target: prod
     container_name: basegun-frontend
-    image: basegun-frontend:${TAG}-prod
+    image: basegun-frontend:${TAG}
     ports:
       - ${PORT_PROD:-80}:8080
\ No newline at end of file
diff --git a/infra/scripts/run.sh b/infra/scripts/run.sh
new file mode 100644
index 00000000..bf201d90
--- /dev/null
+++ b/infra/scripts/run.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Launch a cluster like the one in CI
+kind delete cluster
+
+TAG=$(make get-current-tag) BUILD_TARGET=test docker-compose -f docker-compose-prod.yml build
+kind create cluster --config ./infra/kube/kind/kind-config.yml
+
+helm repo add traefik https://traefik.github.io/charts && helm repo update
+helm upgrade \
+  --install \
+  --wait \
+  --namespace traefik \
+  --create-namespace \
+  --values ./infra/kube/kind/traefik-values.yml \
+  traefik traefik/traefik
+
+kind load docker-image \
+  basegun-backend:$(make get-current-tag) \
+  basegun-frontend:$(make get-current-tag)
+
+helm upgrade --install basegun ./infra/kube/helm/  \
+  --set ingress.hosts[0].host=basegun.k8s.local \
+  --set ingress.hosts[0].paths[0].path="/" \
+  --set ingress.hosts[0].paths[0].pathType="Prefix"  \
+  --set backend.image.repository="basegun-backend" \
+  --set backend.image.tag="$(make get-current-tag)" \
+  --set frontend.image.repository="basegun-frontend" \
+  --set frontend.image.tag="$(make get-current-tag)" \
+  --set backend.secret.create="true" \
+  --set-string backend.secret.values.AWS_ACCESS_KEY_ID="x" \
+  --set-string backend.secret.values.AWS_SECRET_ACCESS_KEY="x" \
+  --set-string backend.secret.values.X_OVH_TOKEN="x" \
+  --set-string backend.secret.values.API_OVH_TOKEN="x"