diff --git a/configs/repositories.toml b/configs/repositories.toml
index f3147b87..01394f7e 100644
--- a/configs/repositories.toml
+++ b/configs/repositories.toml
@@ -20,7 +20,7 @@
 # [NAME]
 # ENABLE = true
 # MIRROR = "http://mirror.nl.leaseweb.net/slackware/slackware64-15.0/"
-# BRANCH = "extra"
+# CHANGELOG = "extra"
 # TAG = ""
 
 # This is the DEFAULT REPOSITORY.
@@ -51,20 +51,15 @@ MIRROR = "http://mirror.nl.leaseweb.net/slackware/slackware64-15.0/patches/"
 
 [ALIEN]
 ENABLE = false
-MIRROR = "https://slackware.nl/people/alien/sbrepos/"
-VERSION = "15.0"
-ARCH = "x86_64"
+MIRROR = "https://slackware.nl/people/alien/sbrepos/15.0/x86_64/"
 
 [MULTILIB]
 ENABLE = false
-MIRROR = "https://slackware.nl/people/alien/multilib/"
-VERSION = "15.0"
+MIRROR = "https://slackware.nl/people/alien/multilib/15.0/"
 
 [RESTRICTED]
 ENABLE = false
-MIRROR = "https://slackware.nl/people/alien/restricted_sbrepos/"
-VERSION = "15.0"
-ARCH = "x86_64"
+MIRROR = "https://slackware.nl/people/alien/restricted_sbrepos/15.0/x86_64/"
 
 [GNOME]
 ENABLE = false
@@ -72,16 +67,11 @@ MIRROR = "https://reddoglinux.ddns.net/linux/gnome/41.x/x86_64/"
 
 [MSB]
 ENABLE = false
-MIRROR = "https://slackware.uk/msb/"
-VERSION = "15.0"
-BRANCH = "1.28"
-ARCH = "x86_64"
+MIRROR = "https://slackware.uk/msb/15.0/1.28/x86_64/"
 
 [CSB]
 ENABLE = false
-MIRROR = "https://slackware.uk/csb/"
-VERSION = "15.0"
-ARCH = "x86_64"
+MIRROR = "https://slackware.uk/csb/15.0/x86_64/"
 
 [CONRAID]
 ENABLE = false
diff --git a/slpkg/repositories.py b/slpkg/repositories.py
index 1d802a8d..d7990a91 100644
--- a/slpkg/repositories.py
+++ b/slpkg/repositories.py
@@ -107,8 +107,7 @@ class Repositories:
     csb_repo: bool = False
     csb_repo_name: str = 'csb'
     csb_repo_path: Path = Path(repositories_path, csb_repo_name)
-    csb_repo_mirror_packages: str = ''
-    csb_repo_mirror_changelog: str = ''
+    csb_repo_mirror: str = ''
     csb_repo_tag: str = 'csb'
 
     conraid_repo: bool = False
@@ -189,42 +188,29 @@ class Repositories:
 
             alien_repo: bool = repos_config['alien']['enable']
             alien_repo_url: str = repos_config['alien']['mirror']
-            alien_repo_version: str = repos_config['alien']['version']
-            alien_repo_arch: str = repos_config['alien']['arch']
-            alien_repo_mirror_packages: str = f'{alien_repo_url}{alien_repo_version}/{alien_repo_arch}/'
-            alien_repo_mirror_changelog: str = alien_repo_url
+            alien_repo_mirror_packages: str = alien_repo_url
+            alien_repo_mirror_changelog: str = f"{'/'.join(alien_repo_url.split('/')[:-3])}/"
 
             multilib_repo: bool = repos_config['multilib']['enable']
             multilib_repo_url: str = repos_config['multilib']['mirror']
-            multilib_repo_version: str = repos_config['multilib']['version']
-            multilib_repo_mirror_packages: str = f'{multilib_repo_url}{multilib_repo_version}/'
-            multilib_repo_mirror_changelog: str = multilib_repo_url
+            multilib_repo_mirror_packages: str = multilib_repo_url
+            multilib_repo_mirror_changelog: str = f"{'/'.join(multilib_repo_url.split('/')[:-2])}/"
 
             restricted_repo: bool = repos_config['restricted']['enable']
             restricted_repo_url: str = repos_config['restricted']['mirror']
-            restricted_repo_version: str = repos_config['restricted']['version']
-            restricted_repo_arch: str = repos_config['restricted']['arch']
-            restricted_repo_mirror_packages: str = (f'{restricted_repo_url}{restricted_repo_version}/'
-                                                    f'{restricted_repo_arch}/')
-            restricted_repo_mirror_changelog: str = restricted_repo_url
+            restricted_repo_mirror_packages: str = restricted_repo_url
+            restricted_repo_mirror_changelog: str = f"{'/'.join(restricted_repo_url.split('/')[:-3])}/"
 
             gnome_repo: bool = repos_config['gnome']['enable']
             gnome_repo_mirror: str = repos_config['gnome']['mirror']
 
             msb_repo: bool = repos_config['msb']['enable']
             msb_repo_url: str = repos_config['msb']['mirror']
-            msb_repo_version: str = repos_config['msb']['version']
-            msb_repo_branch: str = repos_config['msb']['branch']
-            msb_repo_arch: str = repos_config['msb']['arch']
-            msb_repo_mirror_packages: str = f'{msb_repo_url}{msb_repo_version}/{msb_repo_branch}/{msb_repo_arch}/'
-            msb_repo_mirror_changelog: str = msb_repo_url
+            msb_repo_mirror_packages: str = msb_repo_url
+            msb_repo_mirror_changelog: str = f"{'/'.join(msb_repo_url.split('/')[:-4])}/"
 
             csb_repo: bool = repos_config['csb']['enable']
-            csb_repo_url: str = repos_config['csb']['mirror']
-            csb_repo_version: str = repos_config['csb']['version']
-            csb_repo_arch: str = repos_config['csb']['arch']
-            csb_repo_mirror_packages: str = f'{csb_repo_url}{csb_repo_version}/{csb_repo_arch}/'
-            csb_repo_mirror_changelog: str = csb_repo_url
+            csb_repo_mirror: str = repos_config['csb']['mirror']
 
             conraid_repo: bool = repos_config['conraid']['enable']
             conraid_repo_mirror: str = repos_config['conraid']['mirror']
@@ -357,8 +343,8 @@ class Repositories:
         csb_repo_name: {
             'enable': csb_repo,
             'path': csb_repo_path,
-            'mirror_packages': csb_repo_mirror_packages,
-            'mirror_changelog': csb_repo_mirror_changelog,
+            'mirror_packages': csb_repo_mirror,
+            'mirror_changelog': csb_repo_mirror,
             'packages_txt': packages_txt,
             'checksums_md5': checksums_md5,
             'changelog_txt': changelog_txt,