diff --git a/environments/example.rb b/environments/example.rb
index 5e01aac..5829094 100644
--- a/environments/example.rb
+++ b/environments/example.rb
@@ -10,7 +10,6 @@ override_attributes(
     "developer_mode" => true
   }
   # "glance" => {
-  #   "image_upload" => true,
   #   "images" => ["precise","cirros"],
   #   "image" => {
   #     "cirros" => "http://hypnotoad/cirros-0.3.0-x86_64-disk.img",
diff --git a/environments/testing.rb b/environments/testing.rb
index 0bbd81b..99f5d01 100644
--- a/environments/testing.rb
+++ b/environments/testing.rb
@@ -221,7 +221,6 @@ override_attributes(
       },
       "debug" => true,
       "identity_service_chef_role" => "os-identity",
-      "image_upload" => true,
       "rabbit_server_chef_role" => "os-ops-messaging",
       "registry" => {
         "bind_interface" => "eth0"
diff --git a/environments/vagrant.rb b/environments/vagrant.rb
index ae3b422..4658763 100644
--- a/environments/vagrant.rb
+++ b/environments/vagrant.rb
@@ -14,7 +14,6 @@ override_attributes(
       },
     },
     "image" => {
-      "image_upload" => true,
       "upload_images" => ["cirros"],
       "upload_image" => {
         "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
diff --git a/infrastructure.yml b/infrastructure.yml
index fc18e71..e731e47 100644
--- a/infrastructure.yml
+++ b/infrastructure.yml
@@ -29,6 +29,7 @@ roles:
 - os-image:
 - os-image-api:
 - os-image-registry:
+- os-image-upload:
 - os-metering-agent-central:
 - os-metering-agent-compute:
 - os-metering-api:
diff --git a/roles/os-image-upload.rb b/roles/os-image-upload.rb
new file mode 100644
index 0000000..f76ef1a
--- /dev/null
+++ b/roles/os-image-upload.rb
@@ -0,0 +1,6 @@
+name "os-image-upload"
+description "Glance image upload"
+run_list(
+  "role[os-base]",
+  "recipe[openstack-image::image_upload]"
+  )
diff --git a/roles/os-image.rb b/roles/os-image.rb
index d3568b7..b667f25 100644
--- a/roles/os-image.rb
+++ b/roles/os-image.rb
@@ -2,6 +2,6 @@ name "os-image"
 description "Roll-up role for Glance."
 run_list(
   "recipe[openstack-image::identity_registration]",
-  "role[os-image-registry]",
-  "role[os-image-api]"
+  "role[os-image-api]",
+  "role[os-image-registry]"
   )