diff --git a/oem/ami/build_ebs_on_ec2.sh b/oem/ami/build_ebs_on_ec2.sh
index 9fbd707f53..a3b45a4569 100755
--- a/oem/ami/build_ebs_on_ec2.sh
+++ b/oem/ami/build_ebs_on_ec2.sh
@@ -178,9 +178,9 @@ amiid=$(ec2-register                                  \
   --architecture "$arch"                              \
   --virtualization-type paravirtual                   \
   --kernel "$akiid"                                   \
-  --root-device-name /dev/xvda                        \
-  --block-device-mapping /dev/xvda=$snapshotid::true  \
-  --block-device-mapping /dev/xvdb=ephemeral0         |
+  --root-device-name /dev/sda                         \
+  --block-device-mapping /dev/sda=$snapshotid::true   \
+  --block-device-mapping /dev/sdb=ephemeral0          |
   cut -f2)
 
 cat <<EOF
diff --git a/oem/ami/prod-publish.sh b/oem/ami/prod-publish.sh
new file mode 100755
index 0000000000..b009f5e4fc
--- /dev/null
+++ b/oem/ami/prod-publish.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+BOARD="amd64-usr"
+GROUP="$1"
+VER="$2"
+DIR=/home/ec2-user/scripts
+
+if [ -z "$GROUP" -o -z "$VER" ]; then
+  echo "Usage: $0 alpha 1.2.3" >&2
+  exit 1
+fi
+
+set -e
+source $DIR/marineam-auth.sh
+$DIR/publish_ami.sh -b $BOARD -g $GROUP -V $VER"