diff --git a/.etckeeper b/.etckeeper
index ea8683b..f530f23 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -2974,6 +2974,18 @@ maybe chgrp 'mock' 'mock/fedora-34-s390x.cfg'
 maybe chmod 0644 'mock/fedora-34-s390x.cfg'
 maybe chgrp 'mock' 'mock/fedora-34-x86_64.cfg'
 maybe chmod 0644 'mock/fedora-34-x86_64.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-aarch64.cfg'
+maybe chmod 0644 'mock/fedora-35-aarch64.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-armhfp.cfg'
+maybe chmod 0644 'mock/fedora-35-armhfp.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-i386.cfg'
+maybe chmod 0644 'mock/fedora-35-i386.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-ppc64le.cfg'
+maybe chmod 0644 'mock/fedora-35-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-s390x.cfg'
+maybe chmod 0644 'mock/fedora-35-s390x.cfg'
+maybe chgrp 'mock' 'mock/fedora-35-x86_64.cfg'
+maybe chmod 0644 'mock/fedora-35-x86_64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-aarch64.cfg'
 maybe chmod 0644 'mock/fedora-eln-aarch64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-i386.cfg'
diff --git a/mock/fedora-35-aarch64.cfg b/mock/fedora-35-aarch64.cfg
deleted file mode 120000
index e435ce1..0000000
--- a/mock/fedora-35-aarch64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-aarch64.cfg b/mock/fedora-35-aarch64.cfg
new file mode 100644
index 0000000..8fbcf54
--- /dev/null
+++ b/mock/fedora-35-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-35-armhfp.cfg b/mock/fedora-35-armhfp.cfg
deleted file mode 120000
index e195fe3..0000000
--- a/mock/fedora-35-armhfp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-armhfp.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-armhfp.cfg b/mock/fedora-35-armhfp.cfg
new file mode 100644
index 0000000..ebd014e
--- /dev/null
+++ b/mock/fedora-35-armhfp.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 'armv7hl'
+config_opts['legal_host_arches'] = ('armv7l', 'armv8l', 'aarch64')
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-35-i386.cfg b/mock/fedora-35-i386.cfg
deleted file mode 120000
index 1f22dd2..0000000
--- a/mock/fedora-35-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-i386.cfg b/mock/fedora-35-i386.cfg
new file mode 100644
index 0000000..ac47321
--- /dev/null
+++ b/mock/fedora-35-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-35-ppc64le.cfg b/mock/fedora-35-ppc64le.cfg
deleted file mode 120000
index 9767495..0000000
--- a/mock/fedora-35-ppc64le.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-ppc64le.cfg b/mock/fedora-35-ppc64le.cfg
new file mode 100644
index 0000000..dcf1278
--- /dev/null
+++ b/mock/fedora-35-ppc64le.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-35-s390x.cfg b/mock/fedora-35-s390x.cfg
deleted file mode 120000
index 3722078..0000000
--- a/mock/fedora-35-s390x.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-s390x.cfg b/mock/fedora-35-s390x.cfg
new file mode 100644
index 0000000..2f8d1ae
--- /dev/null
+++ b/mock/fedora-35-s390x.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-35-x86_64.cfg b/mock/fedora-35-x86_64.cfg
deleted file mode 120000
index cddd6e1..0000000
--- a/mock/fedora-35-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock/fedora-35-x86_64.cfg b/mock/fedora-35-x86_64.cfg
new file mode 100644
index 0000000..ebf37a7
--- /dev/null
+++ b/mock/fedora-35-x86_64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '35'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-36-aarch64.cfg b/mock/fedora-36-aarch64.cfg
new file mode 120000
index 0000000..e435ce1
--- /dev/null
+++ b/mock/fedora-36-aarch64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock/fedora-36-armhfp.cfg b/mock/fedora-36-armhfp.cfg
new file mode 120000
index 0000000..e195fe3
--- /dev/null
+++ b/mock/fedora-36-armhfp.cfg
@@ -0,0 +1 @@
+fedora-rawhide-armhfp.cfg
\ No newline at end of file
diff --git a/mock/fedora-36-i386.cfg b/mock/fedora-36-i386.cfg
new file mode 120000
index 0000000..1f22dd2
--- /dev/null
+++ b/mock/fedora-36-i386.cfg
@@ -0,0 +1 @@
+fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock/fedora-36-ppc64le.cfg b/mock/fedora-36-ppc64le.cfg
new file mode 120000
index 0000000..9767495
--- /dev/null
+++ b/mock/fedora-36-ppc64le.cfg
@@ -0,0 +1 @@
+fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock/fedora-36-s390x.cfg b/mock/fedora-36-s390x.cfg
new file mode 120000
index 0000000..3722078
--- /dev/null
+++ b/mock/fedora-36-s390x.cfg
@@ -0,0 +1 @@
+fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock/fedora-36-x86_64.cfg b/mock/fedora-36-x86_64.cfg
new file mode 120000
index 0000000..cddd6e1
--- /dev/null
+++ b/mock/fedora-36-x86_64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock/templates/fedora-rawhide.tpl b/mock/templates/fedora-rawhide.tpl
index 026b9f3..577df21 100644
--- a/mock/templates/fedora-rawhide.tpl
+++ b/mock/templates/fedora-rawhide.tpl
@@ -9,7 +9,7 @@ config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %
 
 config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '35'
+config_opts['releasever'] = '36'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide'
 
diff --git a/systemd/system/multi-user.target.wants/newrelic-infra.service b/systemd/system/multi-user.target.wants/newrelic-infra.service
new file mode 120000
index 0000000..0fe7ffd
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/newrelic-infra.service
@@ -0,0 +1 @@
+/etc/systemd/system/newrelic-infra.service
\ No newline at end of file