diff --git a/elements/boot-stack/os-refresh-config/configure.d/52-init-openstack b/elements/boot-stack/os-refresh-config/configure.d/53-init-openstack
similarity index 100%
rename from elements/boot-stack/os-refresh-config/configure.d/52-init-openstack
rename to elements/boot-stack/os-refresh-config/configure.d/53-init-openstack
diff --git a/elements/mariadb-rdo/install.d/10-mariadb-rdo-packages b/elements/mariadb-rdo/install.d/10-mariadb-rdo-packages
index 88257f615..24e3aaa17 100755
--- a/elements/mariadb-rdo/install.d/10-mariadb-rdo-packages
+++ b/elements/mariadb-rdo/install.d/10-mariadb-rdo-packages
@@ -4,10 +4,4 @@
 
 set -eux
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages sysstat mytop python-mysqldb mariadb-rdo-galera-server mariadb-galera galera
diff --git a/elements/mariadb/install.d/10-mariadb-packages b/elements/mariadb/install.d/10-mariadb-packages
index e33e8c9ba..8ec260604 100755
--- a/elements/mariadb/install.d/10-mariadb-packages
+++ b/elements/mariadb/install.d/10-mariadb-packages
@@ -4,10 +4,4 @@
 
 set -eux
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages sysstat mytop python-mysqldb mariadb-galera-server mariadb-client galera
diff --git a/elements/mysql-common/install.d/mysql-set-server-id.upstart b/elements/mysql-common/install.d/mysql-set-server-id.upstart
deleted file mode 100644
index 78454e2d5..000000000
--- a/elements/mysql-common/install.d/mysql-set-server-id.upstart
+++ /dev/null
@@ -1,27 +0,0 @@
-# vim: syntax=upstart
-description "Set mysql server_id based on instance-id"
-
-start on starting mysql
-task
-
-env INSTANCE_ID="/var/lib/cloud/data/instance-id"
-env CONF_TARGET="/etc/mysql/conf.d/server_id.cnf"
-
-pre-start script
-    if ! [ -e $INSTANCE_ID ] ; then
-        stop
-        exit 0
-    fi
-end script
-
-script
-    instance=$(cat $INSTANCE_ID)
-    server_id=$(python -c "print 0x${instance##i-}")
-    cat > $CONF_TARGET.new <<EOF
-# Generated by mysql-set-server-id upstart job $(date)
-# From $INSTANCE_ID ${instance}
-[mysqld]
-server_id = $server_id
-EOF
-    mv -f $CONF_TARGET.new $CONF_TARGET
-end script
diff --git a/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id b/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id
new file mode 100755
index 000000000..86cdc25f7
--- /dev/null
+++ b/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id
@@ -0,0 +1,32 @@
+#!/bin/bash
+set -eux
+
+# Set mysql server_id based on instance-id
+
+INSTANCE_ID_FILE="/var/lib/cloud/data/instance-id"
+CONF_TARGET="/etc/mysql/conf.d/server_id.cnf"
+
+if [ ! -f $INSTANCE_ID_FILE ] ; then
+    exit 0
+fi
+
+if [ -f $CONF_TARGET ] ; then
+    echo "MySQL Server ID has already been configured"
+    exit 0
+fi
+
+INSTANCE_ID=$(cat $INSTANCE_ID_FILE)
+
+if [ $INSTANCE_ID = 'nocloud' ]; then
+    echo "nocloud, not configuring server-id"
+    exit 0
+fi
+
+SERVER_ID=$(python -c "print 0x${INSTANCE_ID##i-}")
+
+cat > $CONF_TARGET <<EOF
+# Generated by os-refresh-config on $(date)
+# From $INSTANCE_ID_FILE ${INSTANCE_ID}
+[mysqld]
+server_id = $SERVER_ID
+EOF
diff --git a/elements/mysql/install.d/10-mysql b/elements/mysql/install.d/10-mysql
index d8c1b8157..001882e5e 100755
--- a/elements/mysql/install.d/10-mysql
+++ b/elements/mysql/install.d/10-mysql
@@ -5,12 +5,6 @@
 set -e
 set -o xtrace
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages libaio1 pv rsync lsof
 percona_pkgdir=Percona-XtraDB-Cluster
 
diff --git a/elements/mysql/os-refresh-config/configure.d/51-mysql-init b/elements/mysql/os-refresh-config/configure.d/52-mysql-init
similarity index 100%
rename from elements/mysql/os-refresh-config/configure.d/51-mysql-init
rename to elements/mysql/os-refresh-config/configure.d/52-mysql-init