diff --git a/seeds/06_affiliates.js b/seeds/06_affiliates.js
index 4f2f5b45..56f9a908 100755
--- a/seeds/06_affiliates.js
+++ b/seeds/06_affiliates.js
@@ -313,65 +313,6 @@ const bannerTags = {
 	trueanal_970_90_2: ['anal', 'gaping'],
 	// aylo
 	aylo_728_90_gay: ['gay'],
-	// kelly madison
-	kellymadison_300_250_bed: ['milf', 'big-boobs', 'lingerie', 'stockings'],
-	kellymadison_760_430_bed: ['milf', 'big-boobs'],
-	kellymadison_1700_400_lying: ['milf', 'big-boobs'],
-	kellymadison_1700_400_redwhiteblack: ['milf', 'big-boobs'],
-	pornfidelity_300_250_cg: ['sex', 'cowgirl', 'brunette'],
-	pornfidelity_300_250_cherry_kiss: ['blonde', 'stockings'],
-	pornfidelity_300_250_standing: ['brunette'],
-	pornfidelity_760_430_bj: ['brunette', 'blowjob'],
-	pornfidelity_760_430_cg_sfa: ['brunette', 'sex', 'cowgirl'],
-	pornfidelity_760_430_dbj: ['blowjob', 'threesome', 'mff'],
-	pornfidelity_760_430_miss_sofa: ['sex', 'brunette'],
-	pornfidelity_880_440_cg_sofa: ['sex', 'cowgirl', 'brunette'],
-	pornfidelity_880_440_mff: ['threesome', 'handjob', 'mff'],
-	pornfidelity_880_440_miss_chair: ['sex', 'brunette'],
-	pornfidelity_880_440_miss_sofa: ['sex', 'brunette'],
-	teenfidelity_1323_270_bj: ['teen', 'blowjob', 'brunette'],
-	teenfidelity_1323_270_doggy: ['teen', 'sex', 'brunette', 'doggy-style'],
-	teenfidelity_1323_270_miss: ['teen', 'blonde', 'sex'],
-	teenfidelity_315_271_bj: ['teen', 'brunette', 'blowjob'],
-	teenfidelity_315_271_finger: ['teen'],
-	teenfidelity_315_271_sex: ['teen', 'brunette', 'sex', 'reverse-cowgirl'],
-	// 8k/5k
-	'5kporn_1200_150': ['blonde'],
-	'5kporn_300_100': ['brunette'],
-	'5kporn_300_250': ['brunette'],
-	'5kporn_315_271': ['brunette'],
-	'5kporn_400_100': ['brunette'],
-	'5kporn_468_60': ['brunette'],
-	'5kporn_600_150': ['brunette'],
-	'5kporn_600_500': ['brunette'],
-	'5kporn_728_100': ['brunette'],
-	'5kteens_300_250': ['teen', 'blonde'],
-	'5kteens_315_271': ['teen', 'blonde'],
-	'5kteens_400_100': ['teen', 'blonde'],
-	'5kteens_600_150': ['teen', 'brunette'],
-	'8kteens_300_250_bj': ['teen', 'blowjob', 'brunette'],
-	'8kteens_300_250_hj': ['teen', 'redhead', 'handjob'],
-	'8kteens_300_250': ['teen', 'brunette'],
-	'8kteens_315_271_bj': ['teen', 'blowjob', 'brunette'],
-	'8kteens_315_271': ['teen', 'brunette'],
-	'8kteens_315_271_panties': ['teen', 'brunette'],
-	'8kteens_600_500_split': ['teen', 'blonde', 'redhead'],
-	'8kteens_728_90_bj': ['teen', 'brunette', 'blowjob'],
-	'8kteens_728_90_hj': ['teen', 'handjob', 'blonde'],
-	'8kteens_728_90': ['teen', 'sex', 'missionary', 'blonde'],
-	'8kteens_970_250': ['teen', 'sex', 'missionary', 'brunette'],
-	'8kmilfs_300_250_bj_close': ['blowjob', 'blonde', 'milf'],
-	'8kmilfs_300_250_bj': ['blowjob', 'blonde', 'milf'],
-	'8kmilfs_300_250_busty': ['brunette', 'milf'],
-	'8kmilfs_300_250_payton_preslee': ['sex', 'brunette', 'milf'],
-	'8kmilfs_300_250_ravyn_alexa': ['sex', 'tattoos', 'brunette', 'milf'],
-	'8kmilfs_300_250_sex': ['sex', 'brunette', 'milf'],
-	'8kmilfs_728_90_bj': ['blowjob', 'blonde', 'milf'],
-	'8kmilfs_728_90_payton_preslee': ['sex', 'brunette', 'milf'],
-	'8kmilfs_728_90_sex': ['sex', 'blonde', 'milf'],
-	'8kmilfs_970_250': ['brunette', 'milf'],
-	'8kmilfs_970_250_payton_preslee': ['brunette', 'milf'],
-	'8kmilfs_970_250_sex': ['sex', 'blonde', 'milf'],
 	// teenmegaworld
 	analangels_468_80_animated: ['anal'],
 	analangels_300_250_animated: ['anal'],
@@ -561,10 +502,12 @@ exports.seed = async (knex) => {
 	const files = await scan('./public/banners');
 
 	const banners = files.map((file) => {
-		const [network, channel, banner, type] = file.match(/(\w+)\/(\w+)\/(\w+)\.(\w+)$/).slice(1);
+		const [network, channel, banner, type] = file.match(/(\w+)\/(\w+)\/([\w-]+)\.(\w+)$/).slice(1);
 		const [affiliateId, width, height] = banner.match(/([a-z0-9]+)_(\d{2,4})_(\d{2,4})/).slice(1);
 
-		const tags = bannerTags[banner] || [];
+		const nameTags = banner.split(/-(.*)/)[1]?.split('_');
+		const tags = [...nameTags || [], ...bannerTags[banner] || []];
+
 		const affiliate = affiliates.find((aff) => aff.id === affiliateId)
 			|| affiliates.find((aff) => aff.channel === channel)
 			|| affiliates.find((aff) => aff.network === network);