diff --git a/bin/imds b/bin/imds
index 7b636ae..69a18ad 100755
--- a/bin/imds
+++ b/bin/imds
@@ -87,6 +87,10 @@ _imds_nic_index() { cat "/sys/class/net/$1/address"; }
 
 ### load cloud-specific variables and functions
 
+if [ "$CLOUD" = "auto" ]; then
+	CLOUD=$(cat "$TINY_CLOUD_VAR/.autodetect")
+fi
+
 if [ ! -d "$LIBDIR/tiny-cloud/cloud/$CLOUD" ]; then
 	echo "ERROR: Unknown Cloud '$CLOUD'" >&2
 fi