diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh
index 72e09a899a..96ec00e257 100644
--- a/common/environment/setup-subpkg/subpkg.sh
+++ b/common/environment/setup-subpkg/subpkg.sh
@@ -3,7 +3,7 @@
 
 ## VARIABLES
 unset -v noarch conf_files mutable_files preserve triggers
-unset -v depends run_depends replaces provides conflicts tags repository
+unset -v depends run_depends replaces provides conflicts tags
 
 # hooks/post-install/03-strip-and-debug-pkgs
 unset -v nostrip nostrip_files shlib_requires
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index aa87b0251c..82c6be7355 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -8,7 +8,7 @@ unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_versions
 unset -v patch_args disable_parallel_build keep_libtool_archives
 unset -v reverts subpackages makedepends hostmakedepends depends
-unset -v build_options build_options_default bootstrap
+unset -v build_options build_options_default bootstrap repository
 unset -v CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
 unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF
 
diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index f022189171..c1a74cfc2b 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -105,7 +105,6 @@ catalyst-dkms_package() {
 	triggers="dkms"
 	depends="dkms"
 	dkms_modules="fglrx ${version}_${revision}"
-	repository="nonfree"
 	pkg_install() {
 		local _fglrx=fglrx-${version}_${revision}
 
@@ -132,7 +131,6 @@ catalyst-dkms_package() {
 catalyst-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="libOpenCL"
-	repository="nonfree"
 	pkg_install() {
 		cd ${wrksrc}/arch/${_ARCHDIR}
 
diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template
index 2889910382..06eb73427e 100644
--- a/srcpkgs/nvidia-stable/template
+++ b/srcpkgs/nvidia-stable/template
@@ -161,7 +161,6 @@ nvidia-stable-dkms_package() {
 	depends="dkms"
 	provides="nvidia-dkms-${version}_${revision}"
 	replaces="nvidia-dkms>=0"
-	repository="nonfree"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -174,7 +173,6 @@ nvidia-stable-opencl_package() {
 	provides="nvidia-opencl-${version}_${revision}"
 	replaces="nvidia-opencl>=0"
 	depends="libOpenCL"
-	repository="nonfree"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 18f9998ecc..bb1b6ddcc5 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -159,7 +159,6 @@ nvidia-dkms_package() {
 	triggers="dkms"
 	dkms_modules="nvidia ${version}"
 	depends="dkms"
-	repository="nonfree"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -170,7 +169,6 @@ nvidia-dkms_package() {
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="libOpenCL"
-	repository="nonfree"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index b8e7b485c3..6c934398a5 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -151,7 +151,6 @@ nvidia304-dkms_package() {
 	dkms_modules="nvidia ${version}"
 	provides="nvidia-dkms-${version}_${revision}"
 	replaces="nvidia-dkms>=0"
-	repository="nonfree"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -164,7 +163,6 @@ nvidia304-opencl_package() {
 	provides="nvidia-opencl-${version}_${revision}"
 	replaces="nvidia-openctl>=0"
 	depends="libOpenCL"
-	repository="nonfree"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"