diff --git a/britney.conf b/britney.conf
index d4b0b8b..1e270ae 100644
--- a/britney.conf
+++ b/britney.conf
@@ -1,16 +1,16 @@
 # Configuration file for britney
 
 # Paths for control files
-TESTING           = data/testing
-UNSTABLE          = data/unstable
+TESTING           = data/%(UBUNTU_SERIES)
+UNSTABLE          = data/%(UBUNTU_SERIES)-proposed
 PARTIAL_UNSTABLE  = yes
 
 # Output
-NONINST_STATUS    = data/non-installable-status
-EXCUSES_OUTPUT    = output/excuses.html
-UPGRADE_OUTPUT    = output/output.txt
-HEIDI_OUTPUT      = output/HeidiResult
-DELTA_OUTPUT      = output/Delta
+NONINST_STATUS    = data/%(UBUNTU_SERIES)/non-installable-status
+EXCUSES_OUTPUT    = output/%(UBUNTU_SERIES)/excuses.html
+UPGRADE_OUTPUT    = output/%(UBUNTU_SERIES)/output.txt
+HEIDI_OUTPUT      = output/%(UBUNTU_SERIES)/HeidiResult
+DELTA_OUTPUT      = output/%(UBUNTU_SERIES)/Delta
 
 # List of release architectures
 ARCHITECTURES     = amd64 arm64 armhf i386 powerpc ppc64el
diff --git a/britney.py b/britney.py
index 757e2a8..7299f01 100755
--- a/britney.py
+++ b/britney.py
@@ -385,6 +385,8 @@ class Britney(object):
         self.MINDAYS = {}
         self.HINTS = {'command-line': self.HINTS_ALL}
         for k, v in [map(string.strip,r.split('=', 1)) for r in file(self.options.config) if '=' in r and not r.strip().startswith('#')]:
+            if self.options.ubuntu_series is not None:
+                v = v.replace("%(UBUNTU_SERIES)", self.options.ubuntu_series)
             if k.startswith("MINDAYS_"):
                 self.MINDAYS[k.split("_")[1].lower()] = int(v)
             elif k.startswith("HINTS_"):
diff --git a/britney_nobreakall.conf b/britney_nobreakall.conf
index 140b4f8..ca4566f 100644
--- a/britney_nobreakall.conf
+++ b/britney_nobreakall.conf
@@ -1,16 +1,16 @@
 # Configuration file for britney
 
 # Paths for control files
-TESTING           = data/testing
-UNSTABLE          = data/unstable
+TESTING           = data/%(UBUNTU_SERIES)
+UNSTABLE          = data/%(UBUNTU_SERIES)-proposed
 PARTIAL_UNSTABLE  = yes
 
 # Output
-NONINST_STATUS    = data/non-installable-status
-EXCUSES_OUTPUT    = output/excuses.html
-UPGRADE_OUTPUT    = output/output.txt
-HEIDI_OUTPUT      = output/HeidiResult
-DELTA_OUTPUT      = output/Delta
+NONINST_STATUS    = data/%(UBUNTU_SERIES)/non-installable-status
+EXCUSES_OUTPUT    = output/%(UBUNTU_SERIES)/excuses.html
+UPGRADE_OUTPUT    = output/%(UBUNTU_SERIES)/output.txt
+HEIDI_OUTPUT      = output/%(UBUNTU_SERIES)/HeidiResult
+DELTA_OUTPUT      = output/%(UBUNTU_SERIES)/Delta
 
 # List of release architectures
 ARCHITECTURES     = amd64 arm64 armhf i386 powerpc ppc64el