diff --git a/config/400-config-br-default-channel.yaml b/config/400-config-br-default-channel.yaml
deleted file mode 100644
index 2ea55278937..00000000000
--- a/config/400-config-br-default-channel.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 The Knative Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: config-br-default-channel
-  namespace: knative-eventing
-data:
-  channelTemplateSpec: |
-    apiVersion: messaging.knative.dev/v1alpha1
-    kind: InMemoryChannel
diff --git a/config/400-config-br-default-channel.yaml b/config/400-config-br-default-channel.yaml
new file mode 120000
index 00000000000..3da6810d7aa
--- /dev/null
+++ b/config/400-config-br-default-channel.yaml
@@ -0,0 +1 @@
+core/configmaps/default-broker-channel.yaml
\ No newline at end of file
diff --git a/config/400-config-br-defaults.yaml b/config/400-config-br-defaults.yaml
deleted file mode 100644
index fb30122d119..00000000000
--- a/config/400-config-br-defaults.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020 The Knative Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: config-br-defaults
-  namespace: knative-eventing
-data:
-  # Configuration for defaulting channels that do not specify CRD implementations.
-  default-br-config: |
-    clusterDefault:
-      brokerClass: ChannelBasedBroker
-      apiVersion: v1
-      kind: ConfigMap
-      name: config-br-default-channel
-      namespace: knative-eventing
diff --git a/config/400-config-br-defaults.yaml b/config/400-config-br-defaults.yaml
new file mode 120000
index 00000000000..df14d237701
--- /dev/null
+++ b/config/400-config-br-defaults.yaml
@@ -0,0 +1 @@
+core/configmaps/default-broker.yaml
\ No newline at end of file
diff --git a/config/core/configmaps/default-broker-channel.yaml b/config/core/configmaps/default-broker-channel.yaml
new file mode 100644
index 00000000000..2ea55278937
--- /dev/null
+++ b/config/core/configmaps/default-broker-channel.yaml
@@ -0,0 +1,23 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: config-br-default-channel
+  namespace: knative-eventing
+data:
+  channelTemplateSpec: |
+    apiVersion: messaging.knative.dev/v1alpha1
+    kind: InMemoryChannel
diff --git a/config/core/configmaps/default-broker.yaml b/config/core/configmaps/default-broker.yaml
new file mode 100644
index 00000000000..fb30122d119
--- /dev/null
+++ b/config/core/configmaps/default-broker.yaml
@@ -0,0 +1,28 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: config-br-defaults
+  namespace: knative-eventing
+data:
+  # Configuration for defaulting channels that do not specify CRD implementations.
+  default-br-config: |
+    clusterDefault:
+      brokerClass: ChannelBasedBroker
+      apiVersion: v1
+      kind: ConfigMap
+      name: config-br-default-channel
+      namespace: knative-eventing