diff --git a/setup/db/221to222.sql b/setup/db/221to222.sql
index 25cfae9bd7d..0149727a537 100644
--- a/setup/db/221to222.sql
+++ b/setup/db/221to222.sql
@@ -27,4 +27,6 @@ update network_offerings set specify_vlan=1 where system_only=0 and guest_type='
 update networks set traffic_type='Guest' where network_offering_id in (select id from network_offerings where system_only=0);
 update network_offerings set availability='Optional' where id=7;
 delete from configuration where name='router.cleanup.interval';
+INSERT INTO configuration (category, instance, component, name, value, description)
+    VALUES ('Advanced', 'DEFAULT', 'management-server', 'management.network.cidr', NULL, 'The cidr of management server network');
 
diff --git a/setup/db/data-21to22.sql b/setup/db/data-21to22.sql
index 4c89f8e3d5f..31ae7fde8eb 100644
--- a/setup/db/data-21to22.sql
+++ b/setup/db/data-21to22.sql
@@ -11,8 +11,6 @@ INSERT INTO configuration (category, instance, component, name, value, descripti
     VALUES ('Network', 'DEFAULT', 'AgentManager', 'remote.access.vpn.psk.length', '48', 'The length of the ipsec preshared key (minimum 8, maximum 256)');
 INSERT INTO configuration (category, instance, component, name, value, description)
     VALUES ('Network', 'DEFAULT', 'AgentManager', 'remote.access.vpn.user.limit', '8', 'The maximum number of VPN users that can be created per account');
-INSERT INTO configuration (category, instance, component, name, value, description)
-    VALUES ('Advanced', 'DEFAULT', 'management-server', 'management.network.cidr', NULL, 'The cidr of management server network');
 UPDATE vm_template set unique_name='routing_old'  where id=1;
 INSERT INTO vm_template (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones)
     VALUES (10, 'routing', 'SystemVM Template', 0, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/releases/2.2/systemvm.vhd.bz2', 'bcc7f290f4c27ab4d0fe95d1012829ea', 0, 'SystemVM Template', 'VHD', 15, 0, 1);