diff --git a/backend/src/app/storage.clj b/backend/src/app/storage.clj
index a4e7209ea..4b714d42f 100644
--- a/backend/src/app/storage.clj
+++ b/backend/src/app/storage.clj
@@ -88,7 +88,7 @@
   [{:keys [conn backend executor]} {:keys [::content ::expired-at ::touched-at] :as params}]
   (us/assert ::storage-content content)
   (px/with-dispatch executor
-    (let [id     (uuid/next)
+    (let [id     (uuid/random)
 
           mdata  (cond-> (get-metadata params)
                    (satisfies? impl/IContentHash content)
diff --git a/manage.sh b/manage.sh
index de4398405..438da6f8f 100755
--- a/manage.sh
+++ b/manage.sh
@@ -24,9 +24,8 @@ function build-devenv {
 
     pushd docker/devenv;
 
-    docker buildx inspect penpot > /dev/null 2>&1;
     docker run --privileged --rm tonistiigi/binfmt --install all
-
+    docker buildx inspect penpot > /dev/null 2>&1;
 
     if [ $? -eq 1 ]; then
         docker buildx create --name=penpot --use