diff --git a/oem/ami/upload_ami_txt.sh b/oem/ami/upload_ami_txt.sh
index 0d5b2d55f9..f2be924822 100755
--- a/oem/ami/upload_ami_txt.sh
+++ b/oem/ami/upload_ami_txt.sh
@@ -60,6 +60,16 @@ if [[ ! -n "$VER" ]]; then
     exit 1
 fi
 
+if [[ -z "$GROUP" ]]; then
+    if [[ "$BOARD" == "amd64-generic" ]]; then
+        GROUP="dev-channel"
+    elif [[ "$BOARD" == "amd64-usr" ]]; then
+        GROUP="alpha"
+    else
+        GROUP="$BOARD"
+    fi
+fi
+
 declare -A AMIS
 for r in "${!AKI[@]}"; do
     AMI=$(ec2-describe-images --region=${r} -F name="CoreOS-$GROUP-$VER" \