diff --git a/prestashop_docker/backlog.py b/prestashop_docker/backlog.py
index 8206a5a4..3d576885 100644
--- a/prestashop_docker/backlog.py
+++ b/prestashop_docker/backlog.py
@@ -37,7 +37,7 @@ def generate(self):
 
         print('Step 3/3: Building list')
         versions_dict = self.parse_prestashop_versions(prestashop_data, available_php_versions)
-        branches_dict = self.previous_state_versions
+        branches_dict = self.get_branches_and_nightly_from_existing_file()
         self.write_versions_py(versions_dict | branches_dict)
 
     def get_available_php_versions(self):
@@ -49,6 +49,15 @@ def get_available_php_versions(self):
                 available_versions.add(match.group(1))
         return available_versions
 
+    # Branches and nightly entries are manually added in versions.py file.
+    # Let's reuse the existing contents on each generation.
+    def get_branches_and_nightly_from_existing_file(self):
+        branches = {}
+        for branch, php_versions in self.previous_state_versions.items():
+            if branch == self.NIGHTLY or branch.endswith('x'):
+                branches[branch] = (tuple(php_versions))
+        return branches
+
     def parse_prestashop_versions(self, prestashop_json, available_php_versions):
         versions = {}
         for entry in prestashop_json:
diff --git a/versions.py b/versions.py
index 4916a7d5..6b4f5c44 100644
--- a/versions.py
+++ b/versions.py
@@ -162,13 +162,6 @@
         '8.0',
         '8.1',
     ),
-    '8.0.1-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.0.2': (
         '7.2',
         '7.3',
@@ -176,13 +169,6 @@
         '8.0',
         '8.1',
     ),
-    '8.0.2-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.0.3': (
         '7.2',
         '7.3',
@@ -197,13 +183,6 @@
         '8.0',
         '8.1',
     ),
-    '8.0.4-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.0.5': (
         '7.2',
         '7.3',
@@ -232,13 +211,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.0-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.0-rc.1': (
         '7.2',
         '7.3',
@@ -253,13 +225,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.1-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.2': (
         '7.2',
         '7.3',
@@ -267,13 +232,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.2-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.3': (
         '7.2',
         '7.3',
@@ -281,13 +239,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.3-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.4': (
         '7.2',
         '7.3',
@@ -295,13 +246,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.4-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.5': (
         '7.2',
         '7.3',
@@ -309,13 +253,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.5-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.6': (
         '7.2',
         '7.3',
@@ -323,13 +260,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.6-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.7': (
         '7.2',
         '7.3',
@@ -337,13 +267,6 @@
         '8.0',
         '8.1',
     ),
-    '8.1.7-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.1.x': (
         '7.2',
         '7.3',
@@ -358,13 +281,6 @@
         '8.0',
         '8.1',
     ),
-    '8.2.0-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.2.1': (
         '7.2',
         '7.3',
@@ -372,13 +288,6 @@
         '8.0',
         '8.1',
     ),
-    '8.2.1-classic': (
-        '7.2',
-        '7.3',
-        '7.4',
-        '8.0',
-        '8.1',
-    ),
     '8.2.2': (
         '7.2',
         '7.3',