diff --git a/azure/resize-disk.sh b/azure/resize-disk.sh
index d6eebc56e9b5bbd10bf272be4d89d31208e757ed..5f5430cf28d20695d239073553b0de7fe42d8fa6 100755
--- a/azure/resize-disk.sh
+++ b/azure/resize-disk.sh
@@ -7,22 +7,37 @@ nodename=${1-"dbreplica1"}
 # type
 type=${2-"db"}
 
-# resource group
-resource_group="euwest-${type}"
+# disk's size in gb
+disk_size=${3-2048}
 
 # not a choice
+resource_prefix="euwest"
 location=westeurope
+resource_group="euwest-${type}"
 
-# disk's size in gb
-disk_size=${3-2048}
-
-# type of node (worker, db, etc...)
+full_nodename="${nodename}-${resource_prefix}"
+
+# Depending on the types, we compute the resource group
+# worker, db, storage have dedicated shared resource group
+# other can be specifically tailored for them
+if [ $type = 'worker' ]; then   # for workers, it's a shared resource
+    resource_group="${resource_prefix}-${type}s"
+elif [ $type = 'db' ]; then     # for dbs as well
+    resource_group="${resource_prefix}-${type}"
+    full_nodename="${nodename}"
+elif [ $type = 'storage' ]; then
+    resource_group="${resource_prefix}-server"
+else # for other node types (webapp), that is specifically tailored for
+    resource_group="${resource_prefix}-${nodename}"
+fi
+
+# disk's name
 disk_name="${nodename}_pgdata0"
 
 # deallocate the vm (stop, deallocate)
 cmd="az vm deallocate \
     --resource-group ${resource_group} \
-    --name ${nodename}"
+    --name ${full_nodename}"
 echo $cmd
 $cmd