diff --git a/conf/nginx.conf.template b/conf/nginx.conf.template
index c997f90..06c1df3 100644
--- a/conf/nginx.conf.template
+++ b/conf/nginx.conf.template
@@ -593,7 +593,7 @@ http {
       }
 
       # Check that we are uploading an object to a staging build
-      if ($canonical_path !~ '^[^/]+\:(dev-|preprod-|)staging\-[0-9]+(\.[0-9]+){1,3}\.r[0-9]{12}\.[0-9a-f]+\.[^/]+\.[0-9]+/') {
+      if ($canonical_path !~ '^[^/]+\:staging\-[0-9]{10}\.[0-9a-f]+\.[^./]+\.[0-9]+/') {
         return 400;
       }
 
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 925140d..7309305 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -21,7 +21,7 @@ def artifacts_url(request):
 
 @pytest.fixture(scope="class")
 def container(request):
-    request.cls.container = 'githost:owner:repo:staging-0.0.0.0.r190101000000.1234567.pre-merge.12345678'
+    request.cls.container = 'githost:owner:repo:staging-1628004655.8e50acc6a1.pre-merge.28'
 
 @pytest.fixture(scope="class")
 def buckets(request):