diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 1a952e8a2..f4ec45d90 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -68,6 +68,9 @@ import_aws_configuration() {
 
 	boot_mesg "Importing AWS configuration for instance ${instance_id}..."
 
+	# Store instance ID
+	echo "${instance_id}" > /var/run/aws-instance-id
+
 	# Initialise system settings
 	local hostname=$(get local-hostname)