diff --git a/fuelmenu/fuelmenu.py b/fuelmenu/fuelmenu.py
index 23af96c..3067480 100755
--- a/fuelmenu/fuelmenu.py
+++ b/fuelmenu/fuelmenu.py
@@ -57,17 +57,23 @@ class FuelSetup(object):
         # Tasks to be executed on Apply
         self.apply_tasks = set()
         self.version = utils.get_fuel_version()
+        self.codename = 'xenial'
 
         # settings load
         self.settings = settings_module.Settings()
 
+        template_kwargs = {
+            "mos_version": self.version,
+            "codename": self.codename,
+        }
+
         self.settings.load(
             os.path.join(os.path.dirname(__file__), "settings.yaml"),
-            template_kwargs={"mos_version": self.version})
+            template_kwargs=template_kwargs)
 
         self.settings.load(
             consts.SETTINGS_FILE,
-            template_kwargs={"mos_version": self.version})
+            template_kwargs=template_kwargs)
 
         self.main()
         self.choices = []
diff --git a/fuelmenu/settings.yaml b/fuelmenu/settings.yaml
index c4ad0ea..e93309a 100644
--- a/fuelmenu/settings.yaml
+++ b/fuelmenu/settings.yaml
@@ -17,19 +17,19 @@ BOOTSTRAP:
     section: "main universe multiverse"
     uri: "http://archive.ubuntu.com/ubuntu"
     priority: null
-    suite: "trusty"
+    suite: "${codename}"
     type: "deb"
   - name: "ubuntu-updates"
     section: "main universe multiverse"
     uri: "http://archive.ubuntu.com/ubuntu"
     priority: null
-    suite: "trusty-updates"
+    suite: "${codename}-updates"
     type: "deb"
   - name: "ubuntu-security"
     section: "main universe multiverse"
     uri: "http://archive.ubuntu.com/ubuntu"
     priority: null
-    suite: "trusty-security"
+    suite: "${codename}-security"
     type: "deb"
   - name: "mos"
     section: "main restricted"