diff --git a/SOURCES/Rocky-issue b/SOURCES/Rocky-issue
new file mode 100644
index 0000000..5bc4f5f
--- /dev/null
+++ b/SOURCES/Rocky-issue
@@ -0,0 +1,21 @@
+    `.-/+++++++++/-.`
+ `-+++++++++++++++++-`
+.+++++++++++++++++++++.
+-+++++++++++++++++++++++.
++++++++++++++++/-/+++++++
++++++++++++++/.   ./+++++
++++++++++++:.       ./+++
++++++++++:`   `:/:`   .:/
+-++++++:`   .:+++++:`
+ .+++-`   ./+++++++++:`
+  `-`   ./+++++++++++-
+       -+++++++++:-.`
+
+WARNING: THIS RELEASE IS NOT FOR PRODUCTION. YOU SHOULD NOT UPDATE FROM THIS
+         INSTALLATION. THIS INSTALLATION IS NOT SUPPORTED.
+
+         PLEASE REPORT ALL PRE-PRODUCTION BUGS OR ISSUES TO OUR BUG TRACKER AT:
+         https://bugs.rockylinux.org
+
+\S -- TEST RELEASE -- EVALUATION ONLY
+Kernel \r on an \m
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 99a4e48..6a1c423 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -9,7 +9,7 @@
 %define distro  Rocky Linux
 %define major   8
 %define minor   3
-%define rocky_rel 7
+%define rocky_rel 8
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -79,6 +79,9 @@ Source1223:     Rocky-Devel.repo
 #Source1225:     Rocky-FastTrack.repo
 #Source1226:     Rocky-Plus.repo
 
+# Remove once testing is done
+Source4000:     Rocky-issue
+
 %description
 %{distro} release files.
 
@@ -144,30 +147,13 @@ echo "cpe:/o:rocky:rocky:%{major}" > %{buildroot}%{_sysconfdir}/system-release-c
 # create /etc/issue and /etc/issue.net
 #echo '\S' > %{buildroot}%{_sysconfdir}/issue
 #echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
-cat > %{buildroot}%{_sysconfdir}/issue << "EOF"
-    `.-/+++++++++/-.`
-  `-+++++++++++++++++-`
- .+++++++++++++++++++++.
--+++++++++++++++++++++++.
-+++++++++++++++/-/+++++++
-+++++++++++++/.   ./+++++
-+++++++++++:.       ./+++
-+++++++++:`   `:/:`   .:/
--++++++:`   .:+++++:`
- .+++-`   ./+++++++++:`
-  `-`   ./+++++++++++-
-       -+++++++++:-.`
+#cp %{buildroot}%{_sysconfdir}/issue{,.net}
 
-WARNING: THIS RELEASE IS NOT FOR PRODUCTION. YOU CANNOT AND SHOULD NOT UPDATE
-         FROM THIS INSTALLATION. THIS INSTALLATION IS NOT SUPPORTED.
+# Remove these once we are no longer testing
+install -m 0644 %{SOURCE4000} %{buildroot}%{_sysconfdir}/issue
+install -m 0644 %{SOURCE4000} %{buildroot}%{_sysconfdir}/issue.net
+# End
 
-         PLEASE REPORT ALL PRE-PRODUCTION BUGS OR ISSUES TO OUR BUG TRACKER AT:
-         https://bugs.rockylinux.org
-
-\S -- TEST RELEASE -- EVALUATION ONLY
-Kernel \r on an \m
-EOF
-cp %{buildroot}%{_sysconfdir}/issue{,.net}
 echo >> %{buildroot}%{_sysconfdir}/issue
 
 # set up the dist tag macros
@@ -201,11 +187,20 @@ echo "rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
 
 # Copy out GPG keys
 install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -p -m 0644 %{_sourcedir}/RPM-GPG-KEY-* %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
+install -p -m 0644 %{SOURCE101} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
+install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 
 # Copy our yum repos
 install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d
-install -p -m 0644 %{_sourcedir}/*.repo %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1200} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1201} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1202} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1203} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1210} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1211} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1220} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1222} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
 
 %files
 %license LICENSE
@@ -234,6 +229,10 @@ install -p -m 0644 %{_sourcedir}/*.repo %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Sun Apr 18 2021 Louis Abel <label@rockylinux.org> - 8.3-8
+- Emphasize that this is not a production ready release
+- rpmlint
+
 * Wed Apr 14 2021 Louis Abel <label@rockylinux.org> - 8.3-7
 - Fix mantis links