diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
index efa34dfec98..eece93a867d 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
@@ -329,7 +329,7 @@ public class EngineHostVO implements EngineHost, Identity {
     @Column(name = "cpus")
     private Integer cpus;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String storageUrl;
 
     @Column(name = "speed")
diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java
index c5938d65220..4d1896ce796 100644
--- a/engine/schema/src/com/cloud/host/HostVO.java
+++ b/engine/schema/src/com/cloud/host/HostVO.java
@@ -337,7 +337,7 @@ public class HostVO implements Host {
     @Column(name = "cpus")
     private Integer cpus;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String storageUrl;
 
     @Column(name = "speed")
diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java
index c49b28b6793..dda5c38b596 100644
--- a/engine/schema/src/com/cloud/storage/UploadVO.java
+++ b/engine/schema/src/com/cloud/storage/UploadVO.java
@@ -77,7 +77,7 @@ public class UploadVO implements Upload {
     @Column(name = "job_id")
     private String jobId;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String uploadUrl;
 
     @Column(name = "install_path")
diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java
index 4ba50885834..fc4d9c1599e 100644
--- a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java
@@ -84,7 +84,7 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc, DataObj
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "is_copy")
diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
index dd2b35aef98..d28c23b1a50 100644
--- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
@@ -63,7 +63,7 @@ public class VMTemplateVO implements VirtualMachineTemplate {
     @Column(name = "type")
     private Storage.TemplateType templateType;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String url = null;
 
     @Column(name = "hvm")
diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java
index 56a9a9285cd..d086f2dd0aa 100644
--- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeHostVO.java
@@ -93,7 +93,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore {
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "format")
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java
index 2d1a3eddd69..2c706774a4d 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java
@@ -51,7 +51,7 @@ public class ImageStoreVO implements ImageStore {
     @Column(name = "protocol", nullable = false)
     private String protocol;
 
-    @Column(name = "url", nullable = false)
+    @Column(name = "url", nullable = false, length = 2048)
     private String url;
 
     @Column(name = "image_provider_name", nullable = false)
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
index bb05300e21e..024f05604c9 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
@@ -95,10 +95,10 @@ public class TemplateDataStoreVO implements StateObject<ObjectInDataStoreStateMa
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
-    @Column(name = "download_url")
+    @Column(name = "download_url", length = 2048)
     private String extractUrl;
 
     @Column(name = "download_url_created")
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index 91d4ef71cfa..68baab28ae8 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
@@ -96,10 +96,10 @@ public class VolumeDataStoreVO implements StateObject<ObjectInDataStoreStateMach
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
-    @Column(name = "download_url")
+    @Column(name = "download_url", length = 2048)
     private String extractUrl;
 
     @Column(name = "download_url_created")
diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java
index df9c83641f6..f1d932355b9 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java
@@ -78,7 +78,7 @@ public class ObjectInDataStoreVO implements StateObject<ObjectInDataStoreStateMa
     @Column(name = "local_path")
     String localDownloadPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "format")
diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
index 99f61c36611..6d9f03842ff 100644
--- a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
@@ -50,7 +50,7 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id
     @Column(name = "name")
     private String name;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String url;
 
     @Column(name = "protocol")
diff --git a/setup/db/db/schema-471to480.sql b/setup/db/db/schema-471to480.sql
index b79af7f544d..4eb924d988b 100644
--- a/setup/db/db/schema-471to480.sql
+++ b/setup/db/db/schema-471to480.sql
@@ -27,3 +27,5 @@ ALTER TABLE `cloud`.`image_store` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`template_store_ref` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`volume_store_ref` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`volume_store_ref` MODIFY COLUMN `download_url` varchar(2048);
+ALTER TABLE `cloud`.`upload` MODIFY COLUMN `url` varchar(2048);
+ALTER TABLE `cloud`.`host` MODIFY COLUMN `url` varchar(2048);