diff --git a/.centos-release-storage-common.metadata b/.centos-release-storage-common.metadata
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.centos-release-storage-common.metadata
diff --git a/README.md b/README.md
index d4701d4..7dfd108 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,10 @@ centos-release-storage-common is a package shared between the different
 projects of the CentOS Storage SIG. This package contains the public GPG key
 that is used for verification of the released RPMs.
 
-This package needs to get build against the following targets so that the
+This package needs to get built against the following targets so that the
 packages land at the right tag for inclusion in CentOS Extras:
 
+ - core8-extras-common-el8.centos (tag: core8-extras-common-candidate)
  - core7-extras-common-el7.centos (tag: core7-extras-common-candidate)
  - core6-extras-common-el6.centos (tag: core6-extras-common-candidate)
 
@@ -12,11 +13,11 @@ Building the package can be done like this:
 
 
     $ rpmbuild -bs \
-               --define "_sourcedir $PWD" --define "_srcrpmdir $PWD" \
+               --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \
                --define "dist .el7.centos" \
-               centos-release-storage-common.spec
+               SPECS/centos-release-storage-common.spec
 
     $ cbs \
-           build core7-extras-common-el7.centos \
-           centos-release-storage-common-2-2.el7.centos.src.rpm
+           build core8-extras-common-el8.centos \
+           centos-release-storage-common-2-2.el8.centos.src.rpm
 
diff --git a/SOURCES/CentOS-Storage-common.repo b/SOURCES/CentOS-Storage-common.repo
new file mode 100644
index 0000000..b8f1772
--- /dev/null
+++ b/SOURCES/CentOS-Storage-common.repo
@@ -0,0 +1,12 @@
+# CentOS-Storage.repo
+#
+# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more
+# information
+
+[centos-storage-debuginfo]
+name=CentOS-$releasever - Storage SIG - debuginfo
+baseurl=http://debuginfo.centos.org/$contentdir/$releasever/storage/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
+
diff --git a/SOURCES/RPM-GPG-KEY-CentOS-SIG-Storage b/SOURCES/RPM-GPG-KEY-CentOS-SIG-Storage
new file mode 100644
index 0000000..527e575
--- /dev/null
+++ b/SOURCES/RPM-GPG-KEY-CentOS-SIG-Storage
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQENBFTCLWABCADDHh5ktfB+78L6yxcIxwbZgaLKTp0mKvM3i2CjBrbw+xHJ4x9E
+mn39rkTJf2UHOK0PgAp3FftoAFCtrSAXuanNGpEcpSxXDzxNj2QMpAbySZ2r4RpL
+qxNVlB73dHuASXIMlhyV1ASpM6Me0dpaTtyKj38kRPFkWWuIUaiEQzXFgztYx7Kp
+i+we0iUBfSKY47l2rbqyu9qZ8kCeMjuSuLfG5OKw+fj9zwqFJkc+LAz8IPTF4g7p
+48m0m5bUPvKIIa1BfYcyqaTMxfbqjGaF1M37zF1O0TUKGQ+8VddzQmwg7GglQMt3
+FqVer1WJUNPXyEgmZMzfmg7lqdPKKYaQBLk1ABEBAAG0XkNlbnRPUyBTdG9yYWdl
+IFNJRyAoaHR0cDovL3dpa2kuY2VudG9zLm9yZy9TcGVjaWFsSW50ZXJlc3RHcm91
+cC9TdG9yYWdlKSA8c2VjdXJpdHlAY2VudG9zLm9yZz6JATkEEwECACMFAlTCLWAC
+GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDUouUL5FHltbq9B/93dtpt
+lQG2mVvGik9TFgRdt+p3CPTqT1fwNzhB3iO02yJu5oM6s4FB1XqKRaKlqtvtBzyT
+geAwenu74aU1hFv4uq+uETCanUaSgOvTcCn5WXUpOvlwKJV7TUjLSNRfp2dAG8Ig
+d3euLnfajCE13t5BrqhTAlaMxAbGAqtzr6K9y0hUeT0ogjrscfoQSVptlcLs8d7m
+P+VMR4GUfvUAws65JZxBaal4N7eIIZCWktnJ+B3dE3/tsAksGyXGLaSroPSuY18V
+wksdBuscKVV49Ees0SbhvSrF5JJ07ccUt43SSFun84iNW4nuiWm2QOOKMcd182Sk
+d9SDUTFu/G4s2gx7
+=a0nM
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/SPECS/centos-release-storage-common.spec b/SPECS/centos-release-storage-common.spec
new file mode 100644
index 0000000..73e0fe9
--- /dev/null
+++ b/SPECS/centos-release-storage-common.spec
@@ -0,0 +1,59 @@
+Summary: Common release file to establish shared metadata for CentOS Storage SIG
+Name: centos-release-storage-common
+Epoch: 0
+Version: 2
+Release: 2%{?dist}
+License: GPL
+Group: System Environment/Base
+Source0: RPM-GPG-KEY-CentOS-SIG-Storage
+Source1: CentOS-Storage-common.repo
+URL: http://wiki.centos.org/SpecialInterestGroup/Storage
+BuildArch: noarch
+
+Provides: centos-release-storage-common
+%if 0%{?centos} >= 7
+# $contentdir for altarch support was added with CentOS-7.5
+Requires: centos-release >= 7-5.1804.el7.centos.2
+%else
+Requires: centos-release
+%endif
+
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+Common files needed by other centos-release components in the Storage SIG
+
+%prep
+%setup -q -n %{name} -T -c
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+install -m 644 %SOURCE0 $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/yum.repos.d/
+%if 0%{?centos} < 7
+sed -i 's/\$contentdir/centos/g' $RPM_BUILD_ROOT/etc/yum.repos.d/$(basename %SOURCE1)
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
+/etc/yum.repos.d/CentOS-Storage-common.repo
+
+%changelog
+* Tue Jul 31 2018 Niels de Vos <ndevos@redhat.com> - 2-2
+- Add support for altarch repositories
+
+* Fri Sep 22 2017 Niels de Vos <ndevos@redhat.com> - 2-1
+- Add CentOS-Storage-common.repo with shared debuginfo repo
+
+* Thu Nov 12 2015 Niels de Vos <ndevos@redha.com> - 1-2
+- rebuild for CentOS Extras
+
+* Thu Nov 12 2015 Niels de Vos <ndevos@redha.com> - 1-1
+- Basic setup with the gpg key
+- Based on the centos-release-virt-common package