diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
index c3b0340b..9bdd0661 100644
--- a/.github/workflows/auth.yml
+++ b/.github/workflows/auth.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: auth
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/auth,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/auth,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/auth
+          images: ghcr.io/gaucho-racing/mapache-legacy/auth
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/auth@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/auth@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/auth:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/auth:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
index 3d745d3e..680f6a03 100644
--- a/.github/workflows/dashboard.yml
+++ b/.github/workflows/dashboard.yml
@@ -56,7 +56,7 @@ jobs:
           # the rest of the app works.
           build-args: |
             VITE_MAPBOX_ACCESS_TOKEN=${{ secrets.MAPBOX_ACCESS_TOKEN }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/dashboard,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/dashboard,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -146,15 +146,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/dashboard
+          images: ghcr.io/gaucho-racing/mapache-legacy/dashboard
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/dashboard@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/dashboard@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/dashboard:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/dashboard:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 55688d50..2ca92bd7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      id-token: write        # for Vault OIDC auth via vault-pull-secrets
+      id-token: write # for Vault OIDC auth via vault-pull-secrets
     steps:
       - name: Checkout mapache (full history + tags)
         uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
         run: |
           NEW_TAG="${{ github.event.release.tag_name }}"
           NEW="${NEW_TAG#v}"
-          OLD="$(yq '.images[] | select(.name == "ghcr.io/gaucho-racing/mapache/auth") | .newTag' "infra/$KUSTOMIZATION")"
+          OLD="$(yq '.images[] | select(.name == "ghcr.io/gaucho-racing/mapache-legacy/auth") | .newTag' "infra/$KUSTOMIZATION")"
           echo "new_tag=$NEW_TAG" >> "$GITHUB_OUTPUT"
           echo "new=$NEW" >> "$GITHUB_OUTPUT"
           echo "old=$OLD" >> "$GITHUB_OUTPUT"
@@ -77,7 +77,7 @@ jobs:
           # Surgically rewrite the newTag of each mapache/* image only, leaving
           # kerbecs and all comments/formatting untouched for a clean diff.
           awk -v new="$NEW" '
-            $0 ~ "- name: ghcr.io/gaucho-racing/mapache/(auth|vehicle|gr26|p987|live|query|dashboard)$" { inmap=1; print; next }
+            $0 ~ "- name: ghcr.io/gaucho-racing/mapache-legacy/(auth|vehicle|gr26|p987|live|query|dashboard)$" { inmap=1; print; next }
             inmap==1 && $1=="newTag:" { sub(/newTag:[[:space:]]*.*/, "newTag: " new); inmap=0 }
             { print }
           ' "infra/$KUSTOMIZATION" > "infra/$KUSTOMIZATION.tmp" && mv "infra/$KUSTOMIZATION.tmp" "infra/$KUSTOMIZATION"
diff --git a/.github/workflows/gr26.yml b/.github/workflows/gr26.yml
index 405a3d9b..a8857f55 100644
--- a/.github/workflows/gr26.yml
+++ b/.github/workflows/gr26.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: gr26
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/gr26,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/gr26,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/gr26
+          images: ghcr.io/gaucho-racing/mapache-legacy/gr26
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/gr26@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/gr26@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/gr26:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/gr26:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/live.yml b/.github/workflows/live.yml
index e56267b2..733a9867 100644
--- a/.github/workflows/live.yml
+++ b/.github/workflows/live.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: live
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/live,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/live,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/live
+          images: ghcr.io/gaucho-racing/mapache-legacy/live
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/live@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/live@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/live:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/live:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/p987.yml b/.github/workflows/p987.yml
index 7a24d287..8b128acb 100644
--- a/.github/workflows/p987.yml
+++ b/.github/workflows/p987.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: p987
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/p987,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/p987,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/p987
+          images: ghcr.io/gaucho-racing/mapache-legacy/p987
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/p987@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/p987@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/p987:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/p987:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0e0fd6bd..268386e5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -44,4 +44,4 @@ jobs:
       - name: Warm Go module proxy
         run: |
           VERSION="${GITHUB_REF_NAME#mapache-go/}"
-          GOPROXY=proxy.golang.org go list -m "github.com/gaucho-racing/mapache/mapache-go/v3@${VERSION}"
+          GOPROXY=proxy.golang.org go list -m "github.com/gaucho-racing/mapache-legacy/mapache-go/v3@${VERSION}"
diff --git a/.github/workflows/query.yml b/.github/workflows/query.yml
index a6a4569e..2c491666 100644
--- a/.github/workflows/query.yml
+++ b/.github/workflows/query.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: query
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/query,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/query,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/query
+          images: ghcr.io/gaucho-racing/mapache-legacy/query
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/query@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/query@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/query:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/query:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/vehicle.yml b/.github/workflows/vehicle.yml
index 9e31d0b6..3ca9c8a8 100644
--- a/.github/workflows/vehicle.yml
+++ b/.github/workflows/vehicle.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           context: vehicle
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=ghcr.io/gaucho-racing/mapache/vehicle,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/gaucho-racing/mapache-legacy/vehicle,push-by-digest=true,name-canonical=true,push=true
           cache-from: |
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-${{ github.ref_name }}
             type=gha,scope=build-${{ github.workflow }}-${{ steps.platform.outputs.pair }}-main
@@ -141,15 +141,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/gaucho-racing/mapache/vehicle
+          images: ghcr.io/gaucho-racing/mapache-legacy/vehicle
           tags: ${{ steps.tags.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/gaucho-racing/mapache/vehicle@sha256:%s ' *)
+            $(printf 'ghcr.io/gaucho-racing/mapache-legacy/vehicle@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache/vehicle:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/gaucho-racing/mapache-legacy/vehicle:${{ steps.meta.outputs.version }}
diff --git a/README.md b/README.md
index a5d049bd..53a65f9a 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@
 
 <div align="center">
 
-![GitHub contributors](https://img.shields.io/github/contributors/gaucho-racing/mapache?style=flat)
-[![build status](https://github.com/Gaucho-Racing/Mapache/actions/workflows/build.yml/badge.svg)](https://github.com/Gaucho-Racing/Mapache/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/Gaucho-Racing/Mapache/graph/badge.svg?token=FTX4H3ZT5V)](https://codecov.io/gh/Gaucho-Racing/Mapache)
+![GitHub contributors](https://img.shields.io/github/contributors/gaucho-racing/mapache-legacy?style=flat)
+[![build status](https://github.com/gaucho-racing/mapache-legacy/actions/workflows/build.yml/badge.svg)](https://github.com/gaucho-racing/mapache-legacy/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/gaucho-racing/mapache-legacy/graph/badge.svg?token=FTX4H3ZT5V)](https://codecov.io/gh/gaucho-racing/mapache-legacy)
 [![Docker Pulls](https://img.shields.io/docker/pulls/gauchoracing/mp_gr24.svg)](https://hub.docker.com/r/gauchoracing/mp_gr24)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
@@ -100,13 +100,13 @@ shout out my label thats me
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/Gaucho-Racing/Mapache.svg?style=for-the-badge
-[contributors-url]: https://github.com/Gaucho-Racing/Mapache/graphs/contributors
-[forks-shield]: https://img.shields.io/github/forks/Gaucho-Racing/Mapache.svg?style=for-the-badge
-[forks-url]: https://github.com/Gaucho-Racing/Mapache/network/members
-[stars-shield]: https://img.shields.io/github/stars/Gaucho-Racing/Mapache.svg?style=for-the-badge
-[stars-url]: https://github.com/Gaucho-Racing/Mapache/stargazers
-[issues-shield]: https://img.shields.io/github/issues/Gaucho-Racing/Mapache.svg?style=for-the-badge
-[issues-url]: https://github.com/Gaucho-Racing/Mapache/issues
-[license-shield]: https://img.shields.io/github/license/Gaucho-Racing/Mapache.svg?style=for-the-badge
-[license-url]: https://github.com/Gaucho-Racing/Mapache/blob/master/LICENSE.txt
+[contributors-shield]: https://img.shields.io/github/contributors/gaucho-racing/mapache-legacy.svg?style=for-the-badge
+[contributors-url]: https://github.com/gaucho-racing/mapache-legacy/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/gaucho-racing/mapache-legacy.svg?style=for-the-badge
+[forks-url]: https://github.com/gaucho-racing/mapache-legacy/network/members
+[stars-shield]: https://img.shields.io/github/stars/gaucho-racing/mapache-legacy.svg?style=for-the-badge
+[stars-url]: https://github.com/gaucho-racing/mapache-legacy/stargazers
+[issues-shield]: https://img.shields.io/github/issues/gaucho-racing/mapache-legacy.svg?style=for-the-badge
+[issues-url]: https://github.com/gaucho-racing/mapache-legacy/issues
+[license-shield]: https://img.shields.io/github/license/gaucho-racing/mapache-legacy.svg?style=for-the-badge
+[license-url]: https://github.com/gaucho-racing/mapache-legacy/blob/master/LICENSE.txt
diff --git a/auth/api/api.go b/auth/api/api.go
index be73684b..3f56d01f 100644
--- a/auth/api/api.go
+++ b/auth/api/api.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gaucho-racing/mapache/auth/config"
-	"github.com/gaucho-racing/mapache/auth/pkg/logger"
-	"github.com/gaucho-racing/mapache/auth/service"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/auth/service"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
diff --git a/auth/api/auth.go b/auth/api/auth.go
index 0c5fb4e2..b3929e97 100644
--- a/auth/api/auth.go
+++ b/auth/api/auth.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/auth/service"
+	"github.com/gaucho-racing/mapache-legacy/auth/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/auth/api/ping.go b/auth/api/ping.go
index 03935926..a9137172 100644
--- a/auth/api/ping.go
+++ b/auth/api/ping.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/auth/api/user.go b/auth/api/user.go
index f2b59f7d..61cf8903 100644
--- a/auth/api/user.go
+++ b/auth/api/user.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/auth/service"
+	"github.com/gaucho-racing/mapache-legacy/auth/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/auth/config/verify.go b/auth/config/verify.go
index c73e9d1c..749a0ef0 100644
--- a/auth/config/verify.go
+++ b/auth/config/verify.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/gaucho-racing/mapache/auth/pkg/logger"
+import "github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
 
 func Verify() {
 	if Env == "" {
diff --git a/auth/database/db.go b/auth/database/db.go
index 2818e0c8..f58225a9 100644
--- a/auth/database/db.go
+++ b/auth/database/db.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/auth/config"
-	"github.com/gaucho-racing/mapache/auth/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
diff --git a/auth/go.mod b/auth/go.mod
index e86a67e1..88eb370f 100644
--- a/auth/go.mod
+++ b/auth/go.mod
@@ -1,4 +1,4 @@
-module github.com/gaucho-racing/mapache/auth
+module github.com/gaucho-racing/mapache-legacy/auth
 
 go 1.26
 
diff --git a/auth/main.go b/auth/main.go
index 88cd1827..a82b7dee 100644
--- a/auth/main.go
+++ b/auth/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/gaucho-racing/mapache/auth/api"
-	"github.com/gaucho-racing/mapache/auth/config"
-	"github.com/gaucho-racing/mapache/auth/database"
-	"github.com/gaucho-racing/mapache/auth/pkg/logger"
-	"github.com/gaucho-racing/mapache/auth/service"
+	"github.com/gaucho-racing/mapache-legacy/auth/api"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/database"
+	"github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/auth/service"
 )
 
 func main() {
diff --git a/auth/model/auth.go b/auth/model/auth.go
index ebdf5864..610eaf1f 100644
--- a/auth/model/auth.go
+++ b/auth/model/auth.go
@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	"github.com/gaucho-racing/mapache/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
 	"github.com/golang-jwt/jwt/v4"
 )
 
diff --git a/auth/service/auth.go b/auth/service/auth.go
index 693e740f..0dbde576 100644
--- a/auth/service/auth.go
+++ b/auth/service/auth.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gaucho-racing/mapache/auth/config"
-	"github.com/gaucho-racing/mapache/auth/model"
-	"github.com/gaucho-racing/mapache/auth/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/model"
+	"github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/lestrrat-go/jwx/jwk"
 )
diff --git a/auth/service/sentinel.go b/auth/service/sentinel.go
index dce37cd7..fe53eda7 100644
--- a/auth/service/sentinel.go
+++ b/auth/service/sentinel.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/gaucho-racing/mapache/auth/config"
-	"github.com/gaucho-racing/mapache/auth/model"
-	"github.com/gaucho-racing/mapache/auth/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/auth/config"
+	"github.com/gaucho-racing/mapache-legacy/auth/model"
+	"github.com/gaucho-racing/mapache-legacy/auth/pkg/logger"
 )
 
 // SentinelError captures the {"error": "..."} envelope Sentinel v5
diff --git a/dashboard/src/consts/config.tsx b/dashboard/src/consts/config.tsx
index cd714c6e..4da75cc1 100644
--- a/dashboard/src/consts/config.tsx
+++ b/dashboard/src/consts/config.tsx
@@ -20,7 +20,7 @@ export const SKIP_AUTH_CHECK =
   import.meta.env.VITE_SKIP_AUTH_CHECK === "true";
 
 export const SOCIAL_LINKS = {
-  github: "https://github.com/gaucho-racing/mapache",
+  github: "https://github.com/gaucho-racing/mapache-legacy",
   instagram: "https://instagram.com/gauchoracingucsb",
   twitter: "https://twitter.com/gauchoracing_",
   linkedin:
diff --git a/gr24/go.mod b/gr24/go.mod
index 9a03de88..f81255e5 100644
--- a/gr24/go.mod
+++ b/gr24/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/bk1031/rincon-go v1.1.2
 	github.com/eclipse/paho.mqtt.golang v1.4.3
 	github.com/fatih/color v1.17.0
-	github.com/gaucho-racing/mapache-go v1.3.0
+	github.com/gaucho-racing/mapache-legacy-go v1.3.0
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.0
diff --git a/gr24/go.sum b/gr24/go.sum
index 9e469d11..dcfb4224 100644
--- a/gr24/go.sum
+++ b/gr24/go.sum
@@ -17,8 +17,8 @@ github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
 github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/gaucho-racing/mapache-go v1.3.0 h1:RChvdbn0jrPPEqL9nKujk48fJ4otVQ8BRS94v5T+GGc=
-github.com/gaucho-racing/mapache-go v1.3.0/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
+github.com/gaucho-racing/mapache-legacy-go v1.3.0 h1:RChvdbn0jrPPEqL9nKujk48fJ4otVQ8BRS94v5T+GGc=
+github.com/gaucho-racing/mapache-legacy-go v1.3.0/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
diff --git a/gr24/model/acu.go b/gr24/model/acu.go
index 22c652b7..861e2cc4 100644
--- a/gr24/model/acu.go
+++ b/gr24/model/acu.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type ACU struct {
diff --git a/gr24/model/bcm.go b/gr24/model/bcm.go
index 54348176..e1aa66eb 100644
--- a/gr24/model/bcm.go
+++ b/gr24/model/bcm.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type BCM struct {
diff --git a/gr24/model/inverter.go b/gr24/model/inverter.go
index 8c48a35f..0dc2d5ce 100644
--- a/gr24/model/inverter.go
+++ b/gr24/model/inverter.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type Inverter struct {
diff --git a/gr24/model/mobile.go b/gr24/model/mobile.go
index b3626500..765df1cc 100644
--- a/gr24/model/mobile.go
+++ b/gr24/model/mobile.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type Mobile struct {
diff --git a/gr24/model/pedal.go b/gr24/model/pedal.go
index 6de6fd8e..7dd01c9b 100644
--- a/gr24/model/pedal.go
+++ b/gr24/model/pedal.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type Pedal struct {
diff --git a/gr24/model/vdm.go b/gr24/model/vdm.go
index 1e8fb5c4..ea0eaf76 100644
--- a/gr24/model/vdm.go
+++ b/gr24/model/vdm.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type VDM struct {
diff --git a/gr24/model/wheel.go b/gr24/model/wheel.go
index 8edd6a9c..bd1e569f 100644
--- a/gr24/model/wheel.go
+++ b/gr24/model/wheel.go
@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 type Wheel struct {
diff --git a/gr25/api/signal.go b/gr25/api/signal.go
index 51cf53bc..ce537cae 100644
--- a/gr25/api/signal.go
+++ b/gr25/api/signal.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
diff --git a/gr25/database/db.go b/gr25/database/db.go
index 0907ff76..d846b96a 100644
--- a/gr25/database/db.go
+++ b/gr25/database/db.go
@@ -7,7 +7,7 @@ import (
 
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 	singlestore "github.com/singlestore-labs/gorm-singlestore"
 	"gorm.io/gorm"
 )
diff --git a/gr25/go.mod b/gr25/go.mod
index 3486a822..b9c0736b 100644
--- a/gr25/go.mod
+++ b/gr25/go.mod
@@ -48,7 +48,7 @@ require (
 
 require (
 	github.com/fatih/color v1.18.0
-	github.com/gaucho-racing/mapache-go v1.8.0
+	github.com/gaucho-racing/mapache-legacy-go v1.8.0
 	github.com/gin-contrib/cors v1.7.3
 	github.com/singlestore-labs/gorm-singlestore v1.2.0
 	go.uber.org/multierr v1.10.0 // indirect
diff --git a/gr25/go.sum b/gr25/go.sum
index 22b682f5..bd58cf2d 100644
--- a/gr25/go.sum
+++ b/gr25/go.sum
@@ -18,12 +18,12 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
 github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
-github.com/gaucho-racing/mapache-go v1.6.2 h1:pMmuRkRO1jhtF1LLVdb0kQc2HtoXnKDEqq+05VgKiQ4=
-github.com/gaucho-racing/mapache-go v1.6.2/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
-github.com/gaucho-racing/mapache-go v1.7.1 h1:Gs7R58hWfAg0b2/wbIxiFUIenQpM4/LumbSh29CqhCY=
-github.com/gaucho-racing/mapache-go v1.7.1/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
-github.com/gaucho-racing/mapache-go v1.8.0 h1:RIa3FBY5Ie1NDpFzG/R8EUeRsg9+fi3WPc/lbU+XggQ=
-github.com/gaucho-racing/mapache-go v1.8.0/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
+github.com/gaucho-racing/mapache-legacy-go v1.6.2 h1:pMmuRkRO1jhtF1LLVdb0kQc2HtoXnKDEqq+05VgKiQ4=
+github.com/gaucho-racing/mapache-legacy-go v1.6.2/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
+github.com/gaucho-racing/mapache-legacy-go v1.7.1 h1:Gs7R58hWfAg0b2/wbIxiFUIenQpM4/LumbSh29CqhCY=
+github.com/gaucho-racing/mapache-legacy-go v1.7.1/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
+github.com/gaucho-racing/mapache-legacy-go v1.8.0 h1:RIa3FBY5Ie1NDpFzG/R8EUeRsg9+fi3WPc/lbU+XggQ=
+github.com/gaucho-racing/mapache-legacy-go v1.8.0/go.mod h1:I8lpCGdURUpNaDX4JJSWdFDJdjT7i3fMvTvwHICDtqI=
 github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
 github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
diff --git a/gr25/model/acu.go b/gr25/model/acu.go
index 07c4111a..58786846 100644
--- a/gr25/model/acu.go
+++ b/gr25/model/acu.go
@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	mp "github.com/gaucho-racing/mapache-go"
+	mp "github.com/gaucho-racing/mapache-legacy-go"
 )
 
 var ACUStatusOne = mp.Message{
diff --git a/gr25/model/dash_panel.go b/gr25/model/dash_panel.go
index 9582d311..96342459 100644
--- a/gr25/model/dash_panel.go
+++ b/gr25/model/dash_panel.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var DashPanel = mp.Message{
 	mp.NewField("dash_panel", 1, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr25/model/dc_dc.go b/gr25/model/dc_dc.go
index f2fde6ff..15ed1fc6 100644
--- a/gr25/model/dc_dc.go
+++ b/gr25/model/dc_dc.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	mp "github.com/gaucho-racing/mapache-go"
+	mp "github.com/gaucho-racing/mapache-legacy-go"
 )
 
 var DC_DCStatus = mp.Message{
diff --git a/gr25/model/ecu.go b/gr25/model/ecu.go
index e6c91ba3..87ec995c 100644
--- a/gr25/model/ecu.go
+++ b/gr25/model/ecu.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var ECUStatusOne = mp.Message{
 	mp.NewField("state", 1, mp.Unsigned, mp.LittleEndian, nil),
diff --git a/gr25/model/fan_controller.go b/gr25/model/fan_controller.go
index 0a9f3578..d7c0cc54 100644
--- a/gr25/model/fan_controller.go
+++ b/gr25/model/fan_controller.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var FanStatus = mp.Message{
 	mp.NewField("speed", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr25/model/gps.go b/gr25/model/gps.go
index 1b220601..b6843720 100644
--- a/gr25/model/gps.go
+++ b/gr25/model/gps.go
@@ -3,7 +3,7 @@ package model
 import (
 	"math"
 
-	mp "github.com/gaucho-racing/mapache-go"
+	mp "github.com/gaucho-racing/mapache-legacy-go"
 )
 
 var GPSLatitude = mp.Message{
diff --git a/gr25/model/inverter.go b/gr25/model/inverter.go
index 729c006e..763dc8ce 100644
--- a/gr25/model/inverter.go
+++ b/gr25/model/inverter.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var InverterStatusOne = mp.Message{
 	mp.NewField("ac_current", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr25/model/message.go b/gr25/model/message.go
index 3b9726b7..8f2de70a 100644
--- a/gr25/model/message.go
+++ b/gr25/model/message.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var messageMap = map[int]mp.Message{
 	0x003: ECUStatusOne,
diff --git a/gr25/model/tcm.go b/gr25/model/tcm.go
index 4c50d7c5..e90c972c 100644
--- a/gr25/model/tcm.go
+++ b/gr25/model/tcm.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache-go"
+import mp "github.com/gaucho-racing/mapache-legacy-go"
 
 var TCMResourceUtil = mp.Message{
 	mp.NewField("cpu0_freq", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr25/service/ping.go b/gr25/service/ping.go
index f434224b..099c451b 100644
--- a/gr25/service/ping.go
+++ b/gr25/service/ping.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 func HandlePing(vehicleID string, nodeID string, payload []byte) {
diff --git a/gr25/service/signal.go b/gr25/service/signal.go
index 1b6ddb67..61ae1c9e 100644
--- a/gr25/service/signal.go
+++ b/gr25/service/signal.go
@@ -5,7 +5,7 @@ import (
 	"gr25/database"
 	"gr25/utils"
 
-	"github.com/gaucho-racing/mapache-go"
+	"github.com/gaucho-racing/mapache-legacy-go"
 )
 
 // signalCallbacks is a list of functions that will be called when a signal is created or updated
diff --git a/gr26/api/api.go b/gr26/api/api.go
index ee31299c..936a60f1 100644
--- a/gr26/api/api.go
+++ b/gr26/api/api.go
@@ -3,8 +3,8 @@ package api
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
diff --git a/gr26/api/can.go b/gr26/api/can.go
index 19ce0862..240c7c06 100644
--- a/gr26/api/can.go
+++ b/gr26/api/can.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/model"
-	"github.com/gaucho-racing/mapache/gr26/service"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/model"
+	"github.com/gaucho-racing/mapache-legacy/gr26/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/gr26/api/ping.go b/gr26/api/ping.go
index 71857b67..dd429ba8 100644
--- a/gr26/api/ping.go
+++ b/gr26/api/ping.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/gr26/config/verify.go b/gr26/config/verify.go
index 41ade547..1ae7bb5f 100644
--- a/gr26/config/verify.go
+++ b/gr26/config/verify.go
@@ -3,7 +3,7 @@ package config
 import (
 	"strconv"
 
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 )
 
 func Verify() {
diff --git a/gr26/database/db.go b/gr26/database/db.go
index cfd482ae..f0476362 100644
--- a/gr26/database/db.go
+++ b/gr26/database/db.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var Conn driver.Conn
diff --git a/gr26/go.mod b/gr26/go.mod
index bb60dd8e..6865f6e6 100644
--- a/gr26/go.mod
+++ b/gr26/go.mod
@@ -1,4 +1,4 @@
-module github.com/gaucho-racing/mapache/gr26
+module github.com/gaucho-racing/mapache-legacy/gr26
 
 go 1.26
 
@@ -9,7 +9,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.103.1
 	github.com/eclipse/paho.golang v0.23.0
 	github.com/fatih/color v1.18.0
-	github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0
+	github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0
 	github.com/gaucho-racing/ulid-go v1.1.0
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.12.0
diff --git a/gr26/go.sum b/gr26/go.sum
index 8d742d03..d8188e77 100644
--- a/gr26/go.sum
+++ b/gr26/go.sum
@@ -65,8 +65,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
 github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
 github.com/gaucho-racing/ulid-go v1.1.0 h1:x00XM8EjlegfhlLYIob+U8ba5iX0gDRUr8mgBsjCunk=
 github.com/gaucho-racing/ulid-go v1.1.0/go.mod h1:HwqoC27UtvXHrmhTO7K2GnXZ1VAeR6tg6EjrSEP5JUU=
 github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
diff --git a/gr26/job/ingest_all_batches.go b/gr26/job/ingest_all_batches.go
index ea79f82a..d1350daf 100644
--- a/gr26/job/ingest_all_batches.go
+++ b/gr26/job/ingest_all_batches.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"time"
 
-	gr26config "github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/foreman"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	gr26config "github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/foreman"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 )
 
 // Reingest=true scopes the idem key to this parent job so previously-ingested
diff --git a/gr26/job/ingest_batch.go b/gr26/job/ingest_batch.go
index 17ea21bd..8efcb6cb 100644
--- a/gr26/job/ingest_batch.go
+++ b/gr26/job/ingest_batch.go
@@ -18,13 +18,13 @@ import (
 	"github.com/parquet-go/parquet-go"
 	ulid "github.com/gaucho-racing/ulid-go"
 
-	gr26config "github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/model"
-	"github.com/gaucho-racing/mapache/gr26/pkg/foreman"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
-	"github.com/gaucho-racing/mapache/gr26/service"
+	gr26config "github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/model"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/foreman"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // ─── producer side: gr26.ingest_batch ───────────────────────────────────────
diff --git a/gr26/job/ingest_latest_batch.go b/gr26/job/ingest_latest_batch.go
index eaaa07c6..17fe4780 100644
--- a/gr26/job/ingest_latest_batch.go
+++ b/gr26/job/ingest_latest_batch.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"sort"
 
-	gr26config "github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/foreman"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	gr26config "github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/foreman"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 )
 
 type ingestLatestParams struct {
diff --git a/gr26/job/shelter.go b/gr26/job/shelter.go
index 01b29beb..72a6bcf2 100644
--- a/gr26/job/shelter.go
+++ b/gr26/job/shelter.go
@@ -10,7 +10,7 @@ import (
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 
-	gr26config "github.com/gaucho-racing/mapache/gr26/config"
+	gr26config "github.com/gaucho-racing/mapache-legacy/gr26/config"
 )
 
 func newS3Client(ctx context.Context) (*s3.Client, error) {
diff --git a/gr26/main.go b/gr26/main.go
index 15ce5ba7..06d72e0a 100644
--- a/gr26/main.go
+++ b/gr26/main.go
@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gaucho-racing/mapache/gr26/api"
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/database"
-	"github.com/gaucho-racing/mapache/gr26/job"
-	"github.com/gaucho-racing/mapache/gr26/mqtt"
-	"github.com/gaucho-racing/mapache/gr26/pkg/foreman"
-	"github.com/gaucho-racing/mapache/gr26/pkg/kerbecs"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
-	"github.com/gaucho-racing/mapache/gr26/service"
+	"github.com/gaucho-racing/mapache-legacy/gr26/api"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/database"
+	"github.com/gaucho-racing/mapache-legacy/gr26/job"
+	"github.com/gaucho-racing/mapache-legacy/gr26/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/foreman"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/kerbecs"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/service"
 )
 
 func main() {
diff --git a/gr26/model/bcu.go b/gr26/model/bcu.go
index 1a58f840..3b4bb940 100644
--- a/gr26/model/bcu.go
+++ b/gr26/model/bcu.go
@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var BCUStatus1 = mp.Message{
diff --git a/gr26/model/dash.go b/gr26/model/dash.go
index 8ff4ffbc..e6fb3007 100644
--- a/gr26/model/dash.go
+++ b/gr26/model/dash.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // bit extracts bit n (0 = LSB) of v as a 0/1 signal with the given name.
 func bit(v int, n uint, name string) mp.Signal {
diff --git a/gr26/model/dcdc.go b/gr26/model/dcdc.go
index 51277647..100c74d9 100644
--- a/gr26/model/dcdc.go
+++ b/gr26/model/dcdc.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var DCDCStatus = mp.Message{
diff --git a/gr26/model/dti.go b/gr26/model/dti.go
index f2ff49b9..80bc87a0 100644
--- a/gr26/model/dti.go
+++ b/gr26/model/dti.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 var DTIData1 = mp.Message{
 	mp.NewField("erpm", 4, mp.Signed, mp.BigEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr26/model/ecu.go b/gr26/model/ecu.go
index 8baced8e..0d2e773e 100644
--- a/gr26/model/ecu.go
+++ b/gr26/model/ecu.go
@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var ECUStatus1 = mp.Message{
diff --git a/gr26/model/fan.go b/gr26/model/fan.go
index c2442ec7..38d36147 100644
--- a/gr26/model/fan.go
+++ b/gr26/model/fan.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 var FanStatus = mp.Message{
 	mp.NewField("fan_speed", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr26/model/gps.go b/gr26/model/gps.go
index 25d83e31..de718640 100644
--- a/gr26/model/gps.go
+++ b/gr26/model/gps.go
@@ -3,7 +3,7 @@ package model
 import (
 	"math"
 
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var GPSLatitude = mp.Message{
diff --git a/gr26/model/inverter.go b/gr26/model/inverter.go
index 326e6245..8cebe322 100644
--- a/gr26/model/inverter.go
+++ b/gr26/model/inverter.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 var InverterStatus1 = mp.Message{
 	mp.NewField("ac_current", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
diff --git a/gr26/model/message.go b/gr26/model/message.go
index 8afcb7bb..0ce66244 100644
--- a/gr26/model/message.go
+++ b/gr26/model/message.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 var messageMap = map[int]mp.Message{
 	// Per-node CAN heartbeat
diff --git a/gr26/model/ping.go b/gr26/model/ping.go
index b3ba9435..4b4b86a0 100644
--- a/gr26/model/ping.go
+++ b/gr26/model/ping.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // Ping (msg 0x002) is the per-node CAN heartbeat. Each node broadcasts it
 // periodically with a 4-byte millis-since-boot timestamp. Decoding it lets
diff --git a/gr26/model/sam.go b/gr26/model/sam.go
index 7a7bcbde..f829f9a0 100644
--- a/gr26/model/sam.go
+++ b/gr26/model/sam.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var SAMIMU = mp.Message{
diff --git a/gr26/model/tcm.go b/gr26/model/tcm.go
index 7f29c0b6..3cc2d775 100644
--- a/gr26/model/tcm.go
+++ b/gr26/model/tcm.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // TCM Status is a synthetic 8-byte message the relay publishes every 5s
 // summarizing on-vehicle connectivity. status_bits is a flat bitfield;
diff --git a/gr26/mqtt/mqtt.go b/gr26/mqtt/mqtt.go
index 5acc53f1..ca19065a 100644
--- a/gr26/mqtt/mqtt.go
+++ b/gr26/mqtt/mqtt.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 
 	"github.com/eclipse/paho.golang/autopaho"
 	"github.com/eclipse/paho.golang/paho"
diff --git a/gr26/pkg/foreman/gr26.go b/gr26/pkg/foreman/gr26.go
index c345d937..c56d24a2 100644
--- a/gr26/pkg/foreman/gr26.go
+++ b/gr26/pkg/foreman/gr26.go
@@ -19,7 +19,7 @@
 
 package foreman
 
-import "github.com/gaucho-racing/mapache/gr26/config"
+import "github.com/gaucho-racing/mapache-legacy/gr26/config"
 
 // Default is the package-level Client, populated by Init() at startup.
 // Always go through Default for producer-side calls (Enqueue, Cancel,
diff --git a/gr26/service/can.go b/gr26/service/can.go
index ef7794de..30c115b9 100644
--- a/gr26/service/can.go
+++ b/gr26/service/can.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/database"
-	"github.com/gaucho-racing/mapache/gr26/model"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/database"
+	"github.com/gaucho-racing/mapache-legacy/gr26/model"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	ulid "github.com/gaucho-racing/ulid-go"
diff --git a/gr26/service/message.go b/gr26/service/message.go
index 3ede23e3..842334c6 100644
--- a/gr26/service/message.go
+++ b/gr26/service/message.go
@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/model"
-	"github.com/gaucho-racing/mapache/gr26/mqtt"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/model"
+	"github.com/gaucho-racing/mapache-legacy/gr26/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // ShelterBatchHook is set by main.go to avoid a service → job import cycle.
diff --git a/gr26/service/ping.go b/gr26/service/ping.go
index 0085959a..2c269311 100644
--- a/gr26/service/ping.go
+++ b/gr26/service/ping.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/database"
-	"github.com/gaucho-racing/mapache/gr26/mqtt"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/database"
+	"github.com/gaucho-racing/mapache-legacy/gr26/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 func HandlePing(vehicleID string, nodeID string, payload []byte) {
diff --git a/gr26/service/signal.go b/gr26/service/signal.go
index 7c3b020f..fb2dc1db 100644
--- a/gr26/service/signal.go
+++ b/gr26/service/signal.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/database"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/database"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	ulid "github.com/gaucho-racing/ulid-go"
 )
 
diff --git a/gr26/service/vehicle.go b/gr26/service/vehicle.go
index e2ec1ed3..b85a8683 100644
--- a/gr26/service/vehicle.go
+++ b/gr26/service/vehicle.go
@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/gr26/config"
-	"github.com/gaucho-racing/mapache/gr26/pkg/kerbecs"
-	"github.com/gaucho-racing/mapache/gr26/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/gr26/config"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/kerbecs"
+	"github.com/gaucho-racing/mapache-legacy/gr26/pkg/logger"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 type uploadKeyCacheEntry struct {
diff --git a/live/api/api.go b/live/api/api.go
index a7e97e65..ac3c4558 100644
--- a/live/api/api.go
+++ b/live/api/api.go
@@ -3,8 +3,8 @@ package api
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/pkg/logger"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
diff --git a/live/api/ping.go b/live/api/ping.go
index a9625076..4b69d8ea 100644
--- a/live/api/ping.go
+++ b/live/api/ping.go
@@ -3,8 +3,8 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/service"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/live/api/stream_sse.go b/live/api/stream_sse.go
index 7df02264..aa2fa520 100644
--- a/live/api/stream_sse.go
+++ b/live/api/stream_sse.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/service"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/live/api/stream_test.go b/live/api/stream_test.go
index bf8f6ef2..3ea048c1 100644
--- a/live/api/stream_test.go
+++ b/live/api/stream_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/service"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
diff --git a/live/api/stream_ws.go b/live/api/stream_ws.go
index 3c0df204..8f3759fd 100644
--- a/live/api/stream_ws.go
+++ b/live/api/stream_ws.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/service"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
diff --git a/live/config/verify.go b/live/config/verify.go
index 26f880f1..4c613c00 100644
--- a/live/config/verify.go
+++ b/live/config/verify.go
@@ -3,7 +3,7 @@ package config
 import (
 	"strconv"
 
-	"github.com/gaucho-racing/mapache/live/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/live/pkg/logger"
 )
 
 func Verify() {
diff --git a/live/go.mod b/live/go.mod
index f2ec63ff..00b0dfc6 100644
--- a/live/go.mod
+++ b/live/go.mod
@@ -1,11 +1,11 @@
-module github.com/gaucho-racing/mapache/live
+module github.com/gaucho-racing/mapache-legacy/live
 
 go 1.26
 
 require (
 	github.com/eclipse/paho.golang v0.23.0
 	github.com/fatih/color v1.18.0
-	github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0
+	github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.12.0
 	github.com/gorilla/websocket v1.5.3
diff --git a/live/go.sum b/live/go.sum
index 663b38de..99802514 100644
--- a/live/go.sum
+++ b/live/go.sum
@@ -15,8 +15,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
 github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
 github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
 github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk=
 github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
diff --git a/live/main.go b/live/main.go
index b1e59321..1e451514 100644
--- a/live/main.go
+++ b/live/main.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/api"
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/mqtt"
-	"github.com/gaucho-racing/mapache/live/pkg/logger"
-	"github.com/gaucho-racing/mapache/live/service"
+	"github.com/gaucho-racing/mapache-legacy/live/api"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/live/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/live/service"
 )
 
 func main() {
diff --git a/live/mqtt/mqtt.go b/live/mqtt/mqtt.go
index 73165c11..44623cc4 100644
--- a/live/mqtt/mqtt.go
+++ b/live/mqtt/mqtt.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/live/config"
-	"github.com/gaucho-racing/mapache/live/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/live/config"
+	"github.com/gaucho-racing/mapache-legacy/live/pkg/logger"
 
 	"github.com/eclipse/paho.golang/autopaho"
 	"github.com/eclipse/paho.golang/paho"
diff --git a/live/service/cache.go b/live/service/cache.go
index db23e34f..ba9f2697 100644
--- a/live/service/cache.go
+++ b/live/service/cache.go
@@ -6,7 +6,7 @@ import (
 	"time"
 	"unsafe"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // signalStructBytes is the fixed-size memory footprint of a Signal — its
diff --git a/live/service/handler.go b/live/service/handler.go
index f7db8dac..f5bd2944 100644
--- a/live/service/handler.go
+++ b/live/service/handler.go
@@ -3,9 +3,9 @@ package service
 import (
 	"encoding/json"
 
-	"github.com/gaucho-racing/mapache/live/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/live/pkg/logger"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // HandleInboundMessage is the MQTT subscription callback. Topic shape is
diff --git a/live/service/hub.go b/live/service/hub.go
index 9fbe3a91..c4d7fb17 100644
--- a/live/service/hub.go
+++ b/live/service/hub.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // Client is the hub-side handle for a connected consumer. Transport layers
diff --git a/live/service/hub_bench_test.go b/live/service/hub_bench_test.go
index 04bfbc21..8165c6f5 100644
--- a/live/service/hub_bench_test.go
+++ b/live/service/hub_bench_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 const benchVehicle = "veh-bench"
diff --git a/live/service/hub_test.go b/live/service/hub_test.go
index c0b55993..40abf90a 100644
--- a/live/service/hub_test.go
+++ b/live/service/hub_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 func newClient(id string, buf int) *Client {
diff --git a/live/service/latency.go b/live/service/latency.go
index 55ccb284..1f3c216e 100644
--- a/live/service/latency.go
+++ b/live/service/latency.go
@@ -3,7 +3,7 @@ package service
 import (
 	"sync"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // latencyTracker keeps a running EWMA of ingest latency in microseconds —
diff --git a/mapache-go/go.mod b/mapache-go/go.mod
index ce2e7f4e..f5bbd149 100644
--- a/mapache-go/go.mod
+++ b/mapache-go/go.mod
@@ -1,3 +1,3 @@
-module github.com/gaucho-racing/mapache/mapache-go/v3
+module github.com/gaucho-racing/mapache-legacy/mapache-go/v3
 
 go 1.26
diff --git a/p987/api/api.go b/p987/api/api.go
index a394367e..46d00dd1 100644
--- a/p987/api/api.go
+++ b/p987/api/api.go
@@ -3,8 +3,8 @@ package api
 import (
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
diff --git a/p987/api/can.go b/p987/api/can.go
index 573d307b..6b3e8f0b 100644
--- a/p987/api/can.go
+++ b/p987/api/can.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/model"
-	"github.com/gaucho-racing/mapache/p987/service"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/model"
+	"github.com/gaucho-racing/mapache-legacy/p987/service"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/p987/api/can_trace.go b/p987/api/can_trace.go
index 07ffaa62..3eef692b 100644
--- a/p987/api/can_trace.go
+++ b/p987/api/can_trace.go
@@ -4,9 +4,9 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/gaucho-racing/mapache/p987/model"
+	"github.com/gaucho-racing/mapache-legacy/p987/model"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 type canFieldTrace struct {
diff --git a/p987/api/ping.go b/p987/api/ping.go
index 8ad07822..b98cf200 100644
--- a/p987/api/ping.go
+++ b/p987/api/ping.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/p987/config/verify.go b/p987/config/verify.go
index 699b37c2..a3e3bb8e 100644
--- a/p987/config/verify.go
+++ b/p987/config/verify.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/gaucho-racing/mapache/p987/pkg/logger"
+import "github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
 func Verify() {
 	if Env == "" {
diff --git a/p987/database/db.go b/p987/database/db.go
index bed2cfca..01f70a4b 100644
--- a/p987/database/db.go
+++ b/p987/database/db.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 var Conn driver.Conn
diff --git a/p987/go.mod b/p987/go.mod
index faf98fbe..b1c95f95 100644
--- a/p987/go.mod
+++ b/p987/go.mod
@@ -1,4 +1,4 @@
-module github.com/gaucho-racing/mapache/p987
+module github.com/gaucho-racing/mapache-legacy/p987
 
 go 1.26
 
@@ -6,7 +6,7 @@ require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.46.0
 	github.com/eclipse/paho.golang v0.23.0
 	github.com/fatih/color v1.18.0
-	github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0
+	github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0
 	github.com/gaucho-racing/ulid-go v1.1.0
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.12.0
diff --git a/p987/go.sum b/p987/go.sum
index 1fd307c3..1db07441 100644
--- a/p987/go.sum
+++ b/p987/go.sum
@@ -23,8 +23,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
 github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
 github.com/gaucho-racing/ulid-go v1.1.0 h1:x00XM8EjlegfhlLYIob+U8ba5iX0gDRUr8mgBsjCunk=
 github.com/gaucho-racing/ulid-go v1.1.0/go.mod h1:HwqoC27UtvXHrmhTO7K2GnXZ1VAeR6tg6EjrSEP5JUU=
 github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
diff --git a/p987/main.go b/p987/main.go
index 5f604acd..aef585aa 100644
--- a/p987/main.go
+++ b/p987/main.go
@@ -3,13 +3,13 @@ package main
 import (
 	"context"
 
-	"github.com/gaucho-racing/mapache/p987/api"
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/database"
-	"github.com/gaucho-racing/mapache/p987/mqtt"
-	"github.com/gaucho-racing/mapache/p987/pkg/kerbecs"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
-	"github.com/gaucho-racing/mapache/p987/service"
+	"github.com/gaucho-racing/mapache-legacy/p987/api"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/database"
+	"github.com/gaucho-racing/mapache-legacy/p987/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/kerbecs"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/service"
 )
 
 func main() {
diff --git a/p987/model/dme.go b/p987/model/dme.go
index 2a7d025c..caa2a5a5 100644
--- a/p987/model/dme.go
+++ b/p987/model/dme.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // Heartbeat is 0x140 from DME.
 var Heartbeat = mp.Message{
diff --git a/p987/model/gateway.go b/p987/model/gateway.go
index 8bf00284..6e0c2a4a 100644
--- a/p987/model/gateway.go
+++ b/p987/model/gateway.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // Gateway_Cfg is 0x70B from Gateway.
 // Gateway module configuration. Constant during capture.
diff --git a/p987/model/klima.go b/p987/model/klima.go
index 6429ebdc..cd741f2d 100644
--- a/p987/model/klima.go
+++ b/p987/model/klima.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // KLIMA is 0x600 from KLIMO.
 var KLIMA = mp.Message{
diff --git a/p987/model/message.go b/p987/model/message.go
index 7c949caa..1b96dd30 100644
--- a/p987/model/message.go
+++ b/p987/model/message.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // messageMap is the vehicle CAN decoder registry, transcribed from
 // cayman_987.dbc in the TCM-987 repo. Ids not listed here are still
diff --git a/p987/model/pas.go b/p987/model/pas.go
index 8d0dfdbb..9b2a6249 100644
--- a/p987/model/pas.go
+++ b/p987/model/pas.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // PAS is 0x165 from PAS.
 var PAS = mp.Message{
diff --git a/p987/model/pdk.go b/p987/model/pdk.go
index 05c098e5..b187cdfd 100644
--- a/p987/model/pdk.go
+++ b/p987/model/pdk.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // PDK1 is 0x44C from PDK.
 var PDK1 = mp.Message{
diff --git a/p987/model/psm.go b/p987/model/psm.go
index 80716437..55708900 100644
--- a/p987/model/psm.go
+++ b/p987/model/psm.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // PSM1 is 0x14A from PSM.
 var PSM1 = mp.Message{
diff --git a/p987/model/sccm.go b/p987/model/sccm.go
index 7a757f9c..1ce3e41d 100644
--- a/p987/model/sccm.go
+++ b/p987/model/sccm.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // SCCM1 is 0xC2 from SCCM.
 var SCCM1 = mp.Message{
diff --git a/p987/model/signal.go b/p987/model/signal.go
index e044e4cf..99a7a985 100644
--- a/p987/model/signal.go
+++ b/p987/model/signal.go
@@ -1,6 +1,6 @@
 package model
 
-import mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+import mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 // Stock Porsche signals do not sit on byte boundaries — SCCM_SteeringAngle
 // is 13 bits starting at bit 2 — so a field here is the contiguous run of
diff --git a/p987/model/tcm.go b/p987/model/tcm.go
index 7756b253..f8b8b10a 100644
--- a/p987/model/tcm.go
+++ b/p987/model/tcm.go
@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	mp "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mp "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // The TCM publishes these under the "tcm" bus label. They never touched a
diff --git a/p987/mqtt/mqtt.go b/p987/mqtt/mqtt.go
index 7358a0a8..22690b68 100644
--- a/p987/mqtt/mqtt.go
+++ b/p987/mqtt/mqtt.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
 	"github.com/eclipse/paho.golang/autopaho"
 	"github.com/eclipse/paho.golang/paho"
diff --git a/p987/service/can.go b/p987/service/can.go
index a67c55b9..d27a80c6 100644
--- a/p987/service/can.go
+++ b/p987/service/can.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/database"
-	"github.com/gaucho-racing/mapache/p987/model"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/database"
+	"github.com/gaucho-racing/mapache-legacy/p987/model"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	ulid "github.com/gaucho-racing/ulid-go"
diff --git a/p987/service/decode_report.go b/p987/service/decode_report.go
index 073b511a..e969056a 100644
--- a/p987/service/decode_report.go
+++ b/p987/service/decode_report.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 )
 
 // A frame that produces no signals never reaches the live path — it is
diff --git a/p987/service/message.go b/p987/service/message.go
index 9223eff4..767b40c1 100644
--- a/p987/service/message.go
+++ b/p987/service/message.go
@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/model"
-	"github.com/gaucho-racing/mapache/p987/mqtt"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/model"
+	"github.com/gaucho-racing/mapache-legacy/p987/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // Decode outcome statuses, recorded in the stored frame's metadata and
diff --git a/p987/service/ping.go b/p987/service/ping.go
index 38c05dc0..29bea58a 100644
--- a/p987/service/ping.go
+++ b/p987/service/ping.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/database"
-	"github.com/gaucho-racing/mapache/p987/mqtt"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/database"
+	"github.com/gaucho-racing/mapache-legacy/p987/mqtt"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // pingPayloadSize is the relay's ping: u64 BE microsecond timestamp
diff --git a/p987/service/signal.go b/p987/service/signal.go
index a4d06c01..2fe9874c 100644
--- a/p987/service/signal.go
+++ b/p987/service/signal.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/database"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/database"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	ulid "github.com/gaucho-racing/ulid-go"
 )
 
diff --git a/p987/service/vehicle.go b/p987/service/vehicle.go
index 58b401b2..3bd31e0d 100644
--- a/p987/service/vehicle.go
+++ b/p987/service/vehicle.go
@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gaucho-racing/mapache/p987/config"
-	"github.com/gaucho-racing/mapache/p987/pkg/kerbecs"
-	"github.com/gaucho-racing/mapache/p987/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/p987/config"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/kerbecs"
+	"github.com/gaucho-racing/mapache-legacy/p987/pkg/logger"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 type uploadKeyCacheEntry struct {
diff --git a/scripts/release.sh b/scripts/release.sh
index fe2b344e..c907cb0c 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -244,7 +244,7 @@ case "$TARGET" in
         done
         echo ""
         echo "  Will publish:"
-        echo "    Go module: github.com/gaucho-racing/mapache/mapache-go/v3@${VERSION}"
+        echo "    Go module: github.com/gaucho-racing/mapache-legacy/mapache-go/v3@${VERSION}"
         echo ""
         read -rp "Proceed? (y/N) " CONFIRM
         if [[ "$CONFIRM" != "y" && "$CONFIRM" != "Y" ]]; then
@@ -269,7 +269,7 @@ case "$TARGET" in
 
         for svc in "${GO_DEPENDENTS[@]}"; do
             echo "Bumping mapache-go in ${svc}..."
-            (cd "${REPO_ROOT}/${svc}" && go get "github.com/gaucho-racing/mapache/mapache-go/v3@${VERSION}" && go mod tidy)
+            (cd "${REPO_ROOT}/${svc}" && go get "github.com/gaucho-racing/mapache-legacy/mapache-go/v3@${VERSION}" && go mod tidy)
         done
 
         FILES=()
@@ -321,7 +321,7 @@ case "$TARGET" in
         echo ""
         echo "  Docker images that will be tagged:"
         for svc in "${ALL_SERVICES[@]}"; do
-            echo "    ghcr.io/gaucho-racing/mapache/${svc}:${SEMVER}"
+            echo "    ghcr.io/gaucho-racing/mapache-legacy/${svc}:${SEMVER}"
         done
         echo ""
         read -rp "Proceed? (y/N) " CONFIRM
diff --git a/vehicle/api/api.go b/vehicle/api/api.go
index d8943078..93d7ea7a 100644
--- a/vehicle/api/api.go
+++ b/vehicle/api/api.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gaucho-racing/mapache/vehicle/config"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/config"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
diff --git a/vehicle/api/config.go b/vehicle/api/config.go
index 2c4f07ba..3771dd3a 100644
--- a/vehicle/api/config.go
+++ b/vehicle/api/config.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/gaucho-racing/mapache/vehicle/model"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
-	"github.com/gaucho-racing/mapache/vehicle/service"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/model"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/service"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/vehicle/api/lap.go b/vehicle/api/lap.go
index 5c3d296f..69121e44 100644
--- a/vehicle/api/lap.go
+++ b/vehicle/api/lap.go
@@ -3,8 +3,8 @@ package api
 import (
 	"net/http"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/service"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/vehicle/api/marker.go b/vehicle/api/marker.go
index 2836116e..fcdbdfdc 100644
--- a/vehicle/api/marker.go
+++ b/vehicle/api/marker.go
@@ -3,8 +3,8 @@ package api
 import (
 	"net/http"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/service"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/vehicle/api/ping.go b/vehicle/api/ping.go
index 8aed4a8c..d7107714 100644
--- a/vehicle/api/ping.go
+++ b/vehicle/api/ping.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/gaucho-racing/mapache/vehicle/config"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/config"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
diff --git a/vehicle/api/session.go b/vehicle/api/session.go
index 8ab82c6b..8ae17ecb 100644
--- a/vehicle/api/session.go
+++ b/vehicle/api/session.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	ulid "github.com/gaucho-racing/ulid-go"
-	"github.com/gaucho-racing/mapache/vehicle/service"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/service"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/vehicle/api/vehicle.go b/vehicle/api/vehicle.go
index 24a5adfe..8fd22d3a 100644
--- a/vehicle/api/vehicle.go
+++ b/vehicle/api/vehicle.go
@@ -3,10 +3,10 @@ package api
 import (
 	"net/http"
 
-	"github.com/gaucho-racing/mapache/vehicle/model"
-	"github.com/gaucho-racing/mapache/vehicle/service"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/model"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/service"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/vehicle/config/verify.go b/vehicle/config/verify.go
index 0d0c381a..337a4c23 100644
--- a/vehicle/config/verify.go
+++ b/vehicle/config/verify.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+import "github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 
 func Verify() {
 	if Env == "" {
diff --git a/vehicle/database/db.go b/vehicle/database/db.go
index 4028c879..b051fc66 100644
--- a/vehicle/database/db.go
+++ b/vehicle/database/db.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/config"
-	"github.com/gaucho-racing/mapache/vehicle/model"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/config"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/model"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
diff --git a/vehicle/go.mod b/vehicle/go.mod
index 9979d517..2a375e4a 100644
--- a/vehicle/go.mod
+++ b/vehicle/go.mod
@@ -1,10 +1,10 @@
-module github.com/gaucho-racing/mapache/vehicle
+module github.com/gaucho-racing/mapache-legacy/vehicle
 
 go 1.26
 
 require (
 	github.com/fatih/color v1.18.0
-	github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0
+	github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0
 	github.com/gaucho-racing/ulid-go v1.1.0
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.12.0
diff --git a/vehicle/go.sum b/vehicle/go.sum
index 0aab583a..100a744a 100644
--- a/vehicle/go.sum
+++ b/vehicle/go.sum
@@ -13,8 +13,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
 github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
-github.com/gaucho-racing/mapache/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0 h1:sihPvHGJ9CgkoqBySJnjZ1IKoHi9kqh0l1w8nAyNDRE=
+github.com/gaucho-racing/mapache-legacy/mapache-go/v3 v3.5.0/go.mod h1:2Zb3ztikLtk3UMS0/bg2nhwroSoyFWvQa/tqVGvYFlc=
 github.com/gaucho-racing/ulid-go v1.1.0 h1:x00XM8EjlegfhlLYIob+U8ba5iX0gDRUr8mgBsjCunk=
 github.com/gaucho-racing/ulid-go v1.1.0/go.mod h1:HwqoC27UtvXHrmhTO7K2GnXZ1VAeR6tg6EjrSEP5JUU=
 github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
diff --git a/vehicle/main.go b/vehicle/main.go
index a8c55170..7b819703 100644
--- a/vehicle/main.go
+++ b/vehicle/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/gaucho-racing/mapache/vehicle/api"
-	"github.com/gaucho-racing/mapache/vehicle/config"
-	"github.com/gaucho-racing/mapache/vehicle/database"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/api"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/config"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 )
 
 func main() {
diff --git a/vehicle/service/config.go b/vehicle/service/config.go
index f3452df6..18d5f569 100644
--- a/vehicle/service/config.go
+++ b/vehicle/service/config.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gaucho-racing/mapache/vehicle/database"
-	"github.com/gaucho-racing/mapache/vehicle/model"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/model"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
diff --git a/vehicle/service/config_integration_test.go b/vehicle/service/config_integration_test.go
index 56cfcc9d..6a30d11a 100644
--- a/vehicle/service/config_integration_test.go
+++ b/vehicle/service/config_integration_test.go
@@ -4,11 +4,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gaucho-racing/mapache/vehicle/database"
-	"github.com/gaucho-racing/mapache/vehicle/model"
-	"github.com/gaucho-racing/mapache/vehicle/pkg/logger"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/model"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/pkg/logger"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 )
 
 // These tests exercise the real Postgres SQL paths (upserts, cascade delete,
diff --git a/vehicle/service/lap.go b/vehicle/service/lap.go
index 933883ec..b47f11c7 100644
--- a/vehicle/service/lap.go
+++ b/vehicle/service/lap.go
@@ -1,8 +1,8 @@
 package service
 
 import (
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/database"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
 	ulid "github.com/gaucho-racing/ulid-go"
 	"gorm.io/gorm"
 )
diff --git a/vehicle/service/marker.go b/vehicle/service/marker.go
index fd161162..34b96ec3 100644
--- a/vehicle/service/marker.go
+++ b/vehicle/service/marker.go
@@ -1,8 +1,8 @@
 package service
 
 import (
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/database"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
 	ulid "github.com/gaucho-racing/ulid-go"
 )
 
diff --git a/vehicle/service/session.go b/vehicle/service/session.go
index 7eacea12..cba35acd 100644
--- a/vehicle/service/session.go
+++ b/vehicle/service/session.go
@@ -1,8 +1,8 @@
 package service
 
 import (
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
-	"github.com/gaucho-racing/mapache/vehicle/database"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
diff --git a/vehicle/service/vehicle.go b/vehicle/service/vehicle.go
index f43e33f1..e3dc1f06 100644
--- a/vehicle/service/vehicle.go
+++ b/vehicle/service/vehicle.go
@@ -1,9 +1,9 @@
 package service
 
 import (
-	"github.com/gaucho-racing/mapache/vehicle/database"
+	"github.com/gaucho-racing/mapache-legacy/vehicle/database"
 
-	mapache "github.com/gaucho-racing/mapache/mapache-go/v3"
+	mapache "github.com/gaucho-racing/mapache-legacy/mapache-go/v3"
 	"gorm.io/gorm/clause"
 )