diff --git a/SOURCES/CentOS-NFV-OpenvSwitch.repo b/SOURCES/CentOS-NFV-OpenvSwitch.repo
index fc4b32f..7039c70 100644
--- a/SOURCES/CentOS-NFV-OpenvSwitch.repo
+++ b/SOURCES/CentOS-NFV-OpenvSwitch.repo
@@ -4,32 +4,31 @@
 # information
 
 [centos-nfv-openvswitch]
-name=CentOS-$releasever - NFV OpenvSwitch
-#baseurl=http://mirror.centos.org/centos/$nfvsigdist/nfv/$basearch/openvswitch-2/
-mirrorlist=http://mirrorlist.centos.org/?release=$nfvsigdist&arch=$basearch&repo=nfv-openvswitch-2
+name=CentOS Stream $releasever - NFV OpenvSwitch
+metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-sig-openvswitch-2-$stream&arch=$basearch&protocol=https,http
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
 [centos-nfv-openvswitch-testing]
-name=CentOS-$releasever - NFV OpenvSwitch Testing
-baseurl=http://buildlogs.centos.org/centos/$nfvsigdist/nfv/$basearch/openvswitch-2/
+name=CentOS Stream $releasever - NFV OpenvSwitch Testing
+baseurl=http://buildlogs.centos.org/centos/$stream/nfv/$basearch/openvswitch-2/
 gpgcheck=0
 enabled=0
 module_hotfixes=1
 
 [centos-nfv-openvswitch-debuginfo]
-name=CentOS-$releasever - NFV OpenvSwitch - Debug
-baseurl=http://debuginfo.centos.org/centos/$nfvsigdist/nfv/$basearch/
+name=CentOS Stream $releasever - NFV OpenvSwitch - Debug
+baseurl=http://debuginfo.centos.org/centos/$stream/nfv/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
 [centos-nfv-openvswitch-source]
-name=CentOS-$releasever - NFV OpenvSwitch - Source
-baseurl=http://vault.centos.org/centos/$releasever/nfv/Source/openvswitch-2/
+name=CentOS Stream $releasever - NFV OpenvSwitch - Source
+baseurl=http://vault.centos.org/centos/$stream/nfv/Source/openvswitch-2/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
diff --git a/SOURCES/CentOS-NFV-extras.repo b/SOURCES/CentOS-NFV-extras.repo
deleted file mode 100644
index e1cb819..0000000
--- a/SOURCES/CentOS-NFV-extras.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-# CentOS-NFV-extras.repo
-#
-# Please see http://wiki.centos.org/SpecialInterestGroup/NFV for more
-# information
-
-[centos-nfv-extras]
-name=CentOS-$releasever - NFV extras
-#baseurl=http://mirror.centos.org/centos/$nfvsigdist/nfv/$basearch/network-extras/
-mirrorlist=http://mirrorlist.centos.org/?release=$nfvsigdist&arch=$basearch&repo=nfv-network-extras
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
-module_hotfixes=1
-
-[centos-nfv-extras-testing]
-name=CentOS-$releasever - NFV extras Testing
-baseurl=http://buildlogs.centos.org/centos/$nfvsigdist/nfv/$basearch/network-extras/
-gpgcheck=0
-enabled=0
-module_hotfixes=1
-
-[centos-nfv-extras-debuginfo]
-name=CentOS-$releasever - NFV extras - Debug
-baseurl=http://debuginfo.centos.org/centos/$nfvsigdist/nfv/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
-module_hotfixes=1
-
-[centos-nfv-extras-source]
-name=CentOS-$releasever - NFV extras - Source
-baseurl=http://vault.centos.org/centos/$releasever/nfv/Source/network-extras/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
-module_hotfixes=1
diff --git a/SPECS/centos-release-nfv.spec b/SPECS/centos-release-nfv.spec
index f0f3043..f091f6a 100644
--- a/SPECS/centos-release-nfv.spec
+++ b/SPECS/centos-release-nfv.spec
@@ -1,13 +1,12 @@
 Summary: Config to enable the repository for the NFV SIG
 Name: centos-release-nfv
 Version: 1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://wiki.centos.org/SpecialInterestGroup/NFV
 Source0: RPM-GPG-KEY-CentOS-SIG-NFV
 Source1: CentOS-NFV-OpenvSwitch.repo
-Source2: CentOS-NFV-extras.repo
 
 BuildArch: noarch
 
@@ -18,7 +17,6 @@ yum configs for repositories as delivered by CentOS NFV SIG.
 Summary: Common package to contain NFV SIG
 
 Requires: centos-release
-Requires: /etc/os-release
 
 %description common
 Common files for repositories as delivered by CentOS NFV SIG.
@@ -31,14 +29,6 @@ Requires: %{name}-common = %{version}-%{release}
 %description openvswitch
 yum configs for repositories as delivered by CentOS NFV SIG.
 
-%package extras
-Summary: Release file to establish repo config for NFV network extras repo
-
-Requires: %{name}-common = %{version}-%{release}
-
-%description extras
-yum configs for repositories as delivered by CentOS NFV SIG.
-
 %prep
 %setup -q -n %{name} -T -c
 
@@ -48,22 +38,6 @@ install -p -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 # openvswitch repo
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-NFV-OpenvSwitch.repo
-install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-NFV-extras.repo
-
-%post common
-if [ -f /etc/os-release ]; then
-    source /etc/os-release
-fi
-if [[ $ID == 'centos' && $NAME == *'Stream' ]] || [ $ID != 'centos' ]; then
-    echo "8-stream" > /etc/dnf/vars/nfvsigdist
-else
-    echo "8" > /etc/dnf/vars/nfvsigdist
-fi
-
-%postun common
-if [ $1 -eq 0 ] ; then
-    rm -f /etc/dnf/vars/nfvsigdist
-fi
 
 %files common
 %defattr(-,root,root)
@@ -73,11 +47,10 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-NFV-OpenvSwitch.repo
 
-%files extras
-%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-NFV-extras.repo
-
 %changelog
+* Thu Feb 10 2022 Alfredo Moralejo <amoralej@redhat.com> - 1-4
+- Support CentOS Stream 9
+
 * Thu Apr 15 2021 Alfredo Moralejo <amoralej@redhat.com> - 1-3
 - Use different repos for CentOS Linux 8 and CentOS Stream 8