diff --git a/managed_rondb/desired_state.jsonc b/managed_rondb/desired_state.jsonc
index ab854e5fe..a472d7579 100644
--- a/managed_rondb/desired_state.jsonc
+++ b/managed_rondb/desired_state.jsonc
@@ -122,10 +122,10 @@
         implemented to support shared network disks / volumes. Therefore, when
         changing these fields for a live cluster, the containers will be replaced.
     */
-    "StorageGiBPerMgmdVm": 4,
-    "StorageGiBPerNdbdVm": 30,
-    "StorageGiBPerMysqldVm": 15,
-    "StorageGiBPerApiVm": 10,
+    "BlockStorageGiBPerMgmdVm": 4,
+    "BlockStorageGiBPerNdbdVm": 30,
+    "BlockStorageGiBPerMysqldVm": 50,
+    "BlockStorageGiBPerApiVm": 10,
     /*
         These are immutable fields that will be fixed in RonDB's config.ini.
         Take these into account when adding ExternallyManagedNodes on a running
diff --git a/managed_rondb/docker-compose.yml b/managed_rondb/docker-compose.yml
index ed097bb7f..3949b2796 100644
--- a/managed_rondb/docker-compose.yml
+++ b/managed_rondb/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     container_name: flask-server
     command: ["--no-active-test-worker"]
     environment:
-      IMAGE_TO_SPAWN: hopsworks/rondb-managed:latest
+      IMAGE_TO_SPAWN: hopsworks/rondb-managed:21.04.15-1.0
       CLOUD_BASE_URL: "http://flask-server:8000"
     ports:
       # Host:Docker
@@ -32,7 +32,7 @@ services:
 
   # This container can be killed once the cluster is running
   bootstrap_agent:
-    image: hopsworks/rondb-managed:latest
+    image: hopsworks/rondb-managed:21.04.15-1.0
     container_name: bootstrap_agent
     environment:
       IS_BOOTSTRAP_HOST: "true"