diff --git a/src/test/groovy/io/seqera/wave/controller/RedisContainerTokenControllerTest.groovy b/src/test/groovy/io/seqera/wave/controller/RedisContainerTokenControllerTest.groovy
index 744cb9a03..6de78f2b8 100644
--- a/src/test/groovy/io/seqera/wave/controller/RedisContainerTokenControllerTest.groovy
+++ b/src/test/groovy/io/seqera/wave/controller/RedisContainerTokenControllerTest.groovy
@@ -61,9 +61,9 @@ class RedisContainerTokenControllerTest extends Specification implements RedisTe
         noExceptionThrown()
 
         and:
-        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens:"+body.containerToken)).platform.arch == 'arm64'
-        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens:"+body.containerToken)).workspaceId == 10
-        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens:"+body.containerToken)).containerImage == 'ubuntu:latest'
+        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens/v0:"+body.containerToken)).platform.arch == 'arm64'
+        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens/v0:"+body.containerToken)).workspaceId == 10
+        new JsonSlurper().parseText(jedisPool.resource.get("wave-tokens/v0:"+body.containerToken)).containerImage == 'ubuntu:latest'
     }
 
     def 'should not retrieve an expired build request' () {
@@ -82,7 +82,7 @@ class RedisContainerTokenControllerTest extends Specification implements RedisTe
         noExceptionThrown()
 
         when:
-        jedisPool.resource.del("wave-tokens:"+body.containerToken)
+        jedisPool.resource.del("wave-tokens/v0:"+body.containerToken)
 
         and:
         RouteHandler routeHelper = applicationContext.getBean(RouteHandler)
diff --git a/src/test/groovy/io/seqera/wave/controller/RedisRegistryControllerTest.groovy b/src/test/groovy/io/seqera/wave/controller/RedisRegistryControllerTest.groovy
index cd984e209..24081058f 100644
--- a/src/test/groovy/io/seqera/wave/controller/RedisRegistryControllerTest.groovy
+++ b/src/test/groovy/io/seqera/wave/controller/RedisRegistryControllerTest.groovy
@@ -90,8 +90,8 @@ class RedisRegistryControllerTest extends Specification implements DockerRegistr
         given:
         HttpClient client = applicationContext.createBean(HttpClient)
         and:
-        jedisPool.resource.set("wave-tokens:1234", '{"containerImage":"hello-world"}')
-        jedisPool.resource.set("wave-build:hello-world", '{"containerImage":"hello-world"}')
+        jedisPool.resource.set("wave-tokens/v0:1234", '{"containerImage":"hello-world"}')
+        jedisPool.resource.set("wave-build/v0:hello-world", '{"containerImage":"hello-world"}')
         when:
         HttpRequest request = HttpRequest.GET("http://localhost:$port/v2/wt/1234/hello-world/manifests/latest").headers({h->
             h.add('Accept', ContentType.DOCKER_MANIFEST_V2_TYPE)