diff --git a/setup/db/db/schema-304to305.sql b/setup/db/db/schema-304to305.sql
index 690640c7716..d16a5eec9f0 100755
--- a/setup/db/db/schema-304to305.sql
+++ b/setup/db/db/schema-304to305.sql
@@ -312,9 +312,9 @@ CREATE TABLE `cloud`.`s2s_customer_gateway` (
   `ipsec_psk` varchar(256),
   `ike_policy` varchar(30) NOT NULL,
   `esp_policy` varchar(30) NOT NULL,
-  `ike_lifetime` int NOT NULL DEFAULT 86400,
-  `esp_lifetime` int NOT NULL DEFAULT 3600,
-  `dpd` int(1) NOT NULL DEFAULT 0,
+  `ike_lifetime` int NOT NULL DEFAULT 86400,
+  `esp_lifetime` int NOT NULL DEFAULT 3600,
+  `dpd` int(1) NOT NULL DEFAULT 0,
   `domain_id` bigint unsigned NOT NULL,
   `account_id` bigint unsigned NOT NULL,
   `removed` datetime COMMENT 'date removed if not null',
@@ -353,3 +353,13 @@ UPDATE `cloud`.`configuration` SET description='In second, timeout for creating
 
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.vpcs', '20', 'The default maximum number of vpcs that can be created for an account');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.vpcs', '20', 'The default maximum number of vpcs that can be created for a project');
+
+UPDATE `cloud`.`configuration` SET category='Network' WHERE name='guest.domain.suffix';
+UPDATE `cloud`.`configuration` SET component='management-server' WHERE name='agent.lb.enabled';
+UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='backup.snapshot.wait';
+UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='copy.volume.wait';
+UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='create.volume.from.snapshot.wait';
+UPDATE `cloud`.`configuration` SET component='TemplateManager' WHERE name='primary.storage.download.wait';
+UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.enabled';
+UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.interval';
+UPDATE `cloud`.`configuration` SET description='Comma separated list of cidrs internal to the datacenter that can host template download servers, please note 0.0.0.0 is not a valid site ' WHERE name='secstorage.allowed.internal.sites';