diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index 52d4e44c3f..101fb45838 100755
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -193,7 +193,6 @@ channels:
   - name: openstack-release
   - name: openstack-requirements
   - name: openstack-rpm-packaging
-  - name: openstack-rsc
   - name: openstack-sahara
   - name: openstack-salt
   - name: openstack-scalpels
@@ -219,6 +218,7 @@ channels:
   - name: openstack-trove
   - name: openstack-ux
   - name: openstack-vahana
+  - name: openstack-valence
   - name: openstack-vitrage
   - name: openstack-vmware-nsx
   - name: openstack-watcher
diff --git a/gerrit/acls/openstack/rsc.config b/gerrit/acls/openstack/rsc.config
deleted file mode 100644
index a5b3f5b7d1..0000000000
--- a/gerrit/acls/openstack/rsc.config
+++ /dev/null
@@ -1,15 +0,0 @@
-[access "refs/heads/*"]
-abandon = group rsc-core
-create = group rsc-release
-label-Code-Review = -2..+2 group rsc-core
-label-Workflow = -1..+1 group rsc-core
-
-[access "refs/tags/*"]
-pushSignedTag = group rsc-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/valence.config b/gerrit/acls/openstack/valence.config
new file mode 100644
index 0000000000..9b0eb67fc2
--- /dev/null
+++ b/gerrit/acls/openstack/valence.config
@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group valence-core
+create = group valence-release
+label-Code-Review = -2..+2 group valence-core
+label-Workflow = -1..+1 group valence-core
+
+[access "refs/tags/*"]
+pushSignedTag = group valence-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 091983ba65..cadc9e6c3f 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -6106,10 +6106,6 @@
   acl-config: /home/gerrit2/acls/openstack/rpm-packaging.config
   groups:
     - rpm-packaging
-- project: openstack/rsc
-  description: Lifecycle management service for pooled bare-metal infrastructure.
-  groups:
-    - openstack-valence
 - project: openstack/sahara
   description: Sahara aims to provide users with simple means to provision a Hadoop
     cluster by specifying several parameters like Hadoop version, cluster topology,
@@ -6536,9 +6532,13 @@
   description: Cookiecutter template for Horizon Plugin.
 - project: openstack/vahana
   description: OpenStack Client libraries for iOS
+- project: openstack/valence
+  description: Lifecycle management service for pooled bare-metal infrastructure.
+  groups:
+    - openstack-valence
 - project: openstack/valence-specs
   description: Valence Design Specifications
-  acl-config: /home/gerrit2/acls/openstack/rsc.config
+  acl-config: /home/gerrit2/acls/openstack/valence.config
 - project: openstack/virtualbmc
   description: A virtual BMC for controlling virtual machines using IPMI commands.
   groups:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 12068200ed..bb9451d2a4 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -13541,14 +13541,6 @@
             - ubuntu-trusty
             - ubuntu-xenial
 
-- project:
-    name: rsc
-    tarball-site: tarballs.openstack.org
-    jobs:
-      - python-jobs
-      - 'gate-{name}-python35{suffix}':
-          suffix: '-nv'
-
 - project:
     name: sahara
     tarball-site: tarballs.openstack.org
@@ -15225,6 +15217,14 @@
       - python-jobs
       - hook-{name}-rtfd
 
+- project:
+    name: valence
+    tarball-site: tarballs.openstack.org
+    jobs:
+      - python-jobs
+      - 'gate-{name}-python35{suffix}':
+          suffix: '-nv'
+
 - project:
     name: valence-specs
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index de80a0a795..6d8380c57c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1792,10 +1792,10 @@ jobs:
       - '^tox.ini'
       - '^upper-constraints.txt'
 
-  # TODO(lin-a-yang): To start with empty repository, mark all rsc jobs
+  # TODO(lin-a-yang): To start with empty repository, mark all valence jobs
   # non-voting to not block any changes. Once the jobs all run fine, change
   # back to voting.
-  - name: ^gate-rsc-(docs|python|requirements).*$
+  - name: ^gate-valence-(docs|python|requirements).*$
     voting: false
 
   # NOTE(mriedem): This job uses xenial nodes which restricts it to >= newton
@@ -16179,23 +16179,6 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
-  - name: openstack/rsc
-    template:
-      - name: merge-check
-    check:
-      - gate-rsc-docs-ubuntu-trusty
-      - gate-rsc-pep8-ubuntu-trusty
-      - gate-rsc-python27-ubuntu-trusty
-      - gate-rsc-docs-ubuntu-xenial
-      - gate-rsc-pep8-ubuntu-xenial
-      - gate-rsc-python27-ubuntu-xenial
-      - gate-rsc-python34
-      - gate-rsc-python35-nv
-      - gate-rsc-requirements
-    gate:
-      - gate-rsc-pep8-ubuntu-trusty
-      - gate-rsc-pep8-ubuntu-xenial
-
   - name: openstack/sahara
     template:
       - name: merge-check
@@ -17746,6 +17729,23 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  - name: openstack/valence
+    template:
+      - name: merge-check
+    check:
+      - gate-valence-docs-ubuntu-trusty
+      - gate-valence-pep8-ubuntu-trusty
+      - gate-valence-python27-ubuntu-trusty
+      - gate-valence-docs-ubuntu-xenial
+      - gate-valence-pep8-ubuntu-xenial
+      - gate-valence-python27-ubuntu-xenial
+      - gate-valence-python34
+      - gate-valence-python35-nv
+      - gate-valence-requirements
+    gate:
+      - gate-valence-pep8-ubuntu-trusty
+      - gate-valence-pep8-ubuntu-xenial
+
   - name: openstack/valence-specs
     template:
       - name: merge-check