diff --git a/debian/changelog b/debian/changelog
index 93960f2..6e4a0a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gce-compute-image-packages (20160930-0ubuntu3~14.04ubuntu1) trusty; urgency=medium
+
+  * GCE mirrors not in place before startup scripts are run (LP: #1436846)
+  * Run google-startup-scripts after cloud-final
+
+ -- Phil Roche <phil.roche@canonical.com>  Tue, 31 Jan 2017 11:49:18 +0000
+
+gce-compute-image-packages (20160930-0ubuntu3~14.04) trusty; urgency=medium
+
+  * Backport gce-compute-image-packages to trusty (LP: #1643585)
+
+ -- Phil Roche <phil.roche@canonical.com>  Thu, 25 Nov 2016 14:02:00 +0000
+
 gce-compute-image-packages (20160930-0ubuntu3) zesty; urgency=medium
 
   * GCE mirrors not in place before startup scripts are run (LP: #1436846)
diff --git a/debian/control b/debian/control
index af22c00..e508db4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,22 +7,17 @@ Build-Depends: debhelper (>= 9),
                dh-systemd,
                python-all,
                python-setuptools,
-               python3-all,
-               python3-setuptools,
                python-pytest,
-               python3-pytest,
                python-mock,
-               python-boto,
-               python3-boto
+               python-boto
 Standards-Version: 3.9.8
 Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages
 
 Package: gce-compute-image-packages
 Architecture: all
-Depends: python3:any,
-         ${python3:Depends},
+Depends: ${python:Depends},
          ${misc:Depends},
-         python3-google-compute-engine,
+         python-google-compute-engine,
          ntp,
          cloud-init
 Recommends: google-cloud-sdk,
@@ -46,12 +41,3 @@ Depends: ${python:Depends},
 Description: Python library for Google Compute Engine interaction
  Python libraries used for interacting with Google Compute Engine's APIs and
  functionality.  This package contains the modules for Python 2.x.
-
-Package: python3-google-compute-engine
-Section: python
-Architecture: all
-Depends: ${python3:Depends},
-         ${misc:Depends},
-Description: Python library for Google Compute Engine interaction (Python 3)
- Python libraries used for interacting with Google Compute Engine's APIs and
- functionality.  This package contains the modules for Python 3.x.
diff --git a/debian/gce-compute-image-packages.install b/debian/gce-compute-image-packages.install
index e3b14c1..df307f6 100644
--- a/debian/gce-compute-image-packages.install
+++ b/debian/gce-compute-image-packages.install
@@ -1,5 +1,6 @@
 # Upstream-provided configuration
 google_compute_engine_init/systemd/*.service lib/systemd/system
+google_compute_engine_init/upstart/*.conf etc/init
 google_config/udev/* lib/udev/rules.d
 
 # Ubuntu-specific configuration
diff --git a/debian/patches/fix-startup-script-ordering-upstart.patch b/debian/patches/fix-startup-script-ordering-upstart.patch
new file mode 100644
index 0000000..ebbc63c
--- /dev/null
+++ b/debian/patches/fix-startup-script-ordering-upstart.patch
@@ -0,0 +1,17 @@
+Description: Fix where GCE startup scripts are run during boot when using Upstart
+  This fixes:
+   * GCE mirrors not in place before startup scripts are run (LP: #1436846)
+   * Run google-startup-scripts after cloud-final
+
+Author: Phil Roche <phil.roche@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1436846
+Last-Update: 2017-01-31
+
+--- gce-compute-image-packages.orig/google_compute_engine_init/upstart/google-startup-scripts.conf
++++ gce-compute-image-packages/google_compute_engine_init/upstart/google-startup-scripts.conf
+@@ -1,4 +1,4 @@
+ # Runs a startup script from metadata.
+-start on stopped google-network-setup
++start on started cloud-final
+ 
+ exec /usr/bin/google_metadata_script_runner --script-type startup
diff --git a/debian/patches/series b/debian/patches/series
index 0787004..09f977f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-startup-script-ordering-upstart.patch
 fix-startup-script-ordering.patch
diff --git a/debian/rules b/debian/rules
index f2fbaba..28a8ec1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,22 +5,7 @@ export PYBUILD_TEST_PYTEST=1
 export PYBUILD_TEST_ARGS={dir}/google_compute_engine/
 
 %:
-	dh $@ --with python2,python3,systemd --buildsystem=pybuild
-
-override_dh_python3:
-	dh_python3
-	
-	# We want to split the Python 3 scripts out to the
-	# gce-compute-image-packages package
-	mkdir -p debian/gce-compute-image-packages/usr/bin/
-	mv debian/python3-google-compute-engine/usr/bin/* debian/gce-compute-image-packages/usr/bin/
-	rmdir debian/python3-google-compute-engine/usr/bin
-
-override_dh_python2:
-	dh_python2
-
-	# We don't want the Python 2 scripts at all
-	rm -rf debian/python-google-compute-engine/usr/bin
+	dh $@ --with python2,systemd --buildsystem=pybuild
 
 override_dh_clean:
 	rm -rf google_compute_engine.egg-info