diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index cf03fda05b..02056b771f 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1000,43 +1000,33 @@
 - project: openstack/charm-interface-bind-rndc
   description: Charm Interface - BIND RNDC
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-bind-rndc
 - project: openstack/charm-interface-hacluster
   description: Charm Interface - HA Cluster
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-hacluster
 - project: openstack/charm-interface-keystone
   description: Charm Interface - Keystone
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-keystone
 - project: openstack/charm-interface-keystone-credentials
   description: Charm Interface - Keystone Credentials
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-keystone-credentials
 - project: openstack/charm-interface-mysql-shared
   description: Charm Interface - MySQL Sahred
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-mysql-shared
 - project: openstack/charm-interface-neutron-plugin
   description: Charm Interface - Neutron Plugin
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-neutron-plugin
 - project: openstack/charm-interface-odl-controller-api
   description: Charm Interface - OpenDayLight Controller API
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-odl-controller-api
 - project: openstack/charm-interface-openstack-ha
   description: Charm Interface - OpenStack HA
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-openstack-ha
 - project: openstack/charm-interface-ovsdb-manager
   description: Charm Interface - OVSDB Manager
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-ovsdb-manager
 - project: openstack/charm-interface-rabbitmq
   description: Charm Interface - RabbitMQ
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-interface-rabbitmq
 - project: openstack/charm-keystone
   description: Juju Charm - Keystone
   acl-config: /home/gerrit2/acls/openstack/charm.config
@@ -1047,15 +1037,12 @@
 - project: openstack/charm-layer-openstack
   description: Charm Layer - OpenStack base layer
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-layer-openstack
 - project: openstack/charm-layer-openstack-api
   description: Charm Layer - OpenStack API layer
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-layer-openstack-api
 - project: openstack/charm-layer-openstack-principle
   description: Charm Layer - OpenStack principle charm layer
   acl-config: /home/gerrit2/acls/openstack/charm.config
-  upstream: https://github.com/openstack-charmers/charm-layer-openstack-principle
 - project: openstack/charm-lxd
   description: Juju Charm - LXD
   acl-config: /home/gerrit2/acls/openstack/charm.config
@@ -1546,22 +1533,18 @@
   groups:
     - fuel-ccp
   description: Fuel Containerized Control Plane (CCP) main project
-  upstream: https://review.fuel-infra.org/nextgen/microservices
 - project: openstack/fuel-ccp-ci-config
   groups:
     - fuel-ccp
   description: Fuel CCP 3rd party CI config
-  upstream: https://review.fuel-infra.org/nextgen/project-config
 - project: openstack/fuel-ccp-debian-base
   groups:
     - fuel-ccp
   description: Fuel CCP - base Debian image
-  upstream: https://review.fuel-infra.org/nextgen/ms-debian-base
 - project: openstack/fuel-ccp-entrypoint
   groups:
     - fuel-ccp
   description: Fuel CCP - container entrypoint script
-  upstream: https://review.fuel-infra.org/nextgen/ms-ext-config
 - project: openstack/fuel-ccp-etcd
   groups:
     - fuel-ccp
@@ -1570,67 +1553,54 @@
   groups:
     - fuel-ccp
   description: Fuel CCP - Glance deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-glance
 - project: openstack/fuel-ccp-horizon
   groups:
     - fuel-ccp
   description: Fuel CCP - Horizon deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-horizon
 - project: openstack/fuel-ccp-installer
   groups:
     - fuel-ccp
   description: Fuel CCP - Installer sub-project
-  upstream: https://review.fuel-infra.org/nextgen/mcpinstaller
 - project: openstack/fuel-ccp-keystone
   groups:
     - fuel-ccp
   description: Fuel CCP - Keystone deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-keystone
 - project: openstack/fuel-ccp-mariadb
   groups:
     - fuel-ccp
   description: Fuel CCP - Mariadb deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-mariadb
 - project: openstack/fuel-ccp-memcached
   groups:
     - fuel-ccp
   description: Fuel CCP - Memcached deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-memcached
 - project: openstack/fuel-ccp-neutron
   groups:
     - fuel-ccp
   description: Fuel CCP - Neutron deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-neutron
 - project: openstack/fuel-ccp-nova
   groups:
     - fuel-ccp
   description: Fuel CCP - Nova deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-nova
 - project: openstack/fuel-ccp-openstack-base
   groups:
     - fuel-ccp
   description: Fuel CCP - base OpenStack image
-  upstream: https://review.fuel-infra.org/nextgen/ms-openstack-base
 - project: openstack/fuel-ccp-rabbitmq
   groups:
     - fuel-ccp
   description: Fuel CCP - Rabbitmq deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-rabbitmq
 - project: openstack/fuel-ccp-specs
   groups:
     - fuel-ccp
   description: Fuel CCP Specs
-  upstream: https://review.fuel-infra.org/nextgen/nextgen-specs
 - project: openstack/fuel-ccp-stacklight
   groups:
     - fuel-ccp
   description: Fuel CCP - Stacklight deployment
-  upstream: https://review.fuel-infra.org/nextgen/ms-lma
 - project: openstack/fuel-ccp-tests
   groups:
     - fuel-ccp
   description: Fuel CCP - Tests sub-project
-  upstream: https://review.fuel-infra.org/nextgen/mcp-qa
 - project: openstack/fuel-dev-tools
   groups:
     - fuel