diff --git a/platforms.json b/platforms.json
index 9795ca8..ed6129c 100644
--- a/platforms.json
+++ b/platforms.json
@@ -1,311 +1,363 @@
 {
-  "Platforms": {
+  "install_instructions": {
+	  
+    "debian_old": [
+      "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
+      "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
+    ],
+    
+	"debian_new":[
+      "sudo apt-get install -y ca-certificates curl gpg",
+      "sudo install -m 0755 -d /etc/apt/keyrings",
+      "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
+      "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
+    ],
+    
+	"ubuntu_old": [
+      "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
+      "echo \"deb [arch=amd64] https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
+    ]
+	
+  },
+  
+  "platforms": {
+	  
     "Astra Linux 1.7": {
       "enabled": true,
       "ondemand": true,
       "codename": "astra1.7",
-      "docker_dir": "astra1.7",
-      "docker_image": "astra1.7",
-      "docker_build_options": {
-        "image_from": "debian:buster-slim",
-        "image_prepare_script": "install_apt.sh"
+      "docker": {
+        "directory": "astra1.7",
+        "image_basename": "astra1.7",
+        "build_options": {
+          "image_from": "debian:buster-slim",
+          "image_prepare_script": "install_apt.sh"
+        }
       },
-      "ppa_filters": ["astra1.7"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["astra1.7"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Astra Linux 1.8": {
       "enabled": true,
       "ondemand": true,
       "codename": "astra1.8",
-      "docker_dir": "astra1.8",
-      "docker_image": "astra1.8",
-      "docker_build_options": {
-        "image_from": "debian:bullseye-slim",
-        "image_prepare_script": "install_apt.sh"
+      "docker": {
+        "directory": "astra1.8",
+        "image_basename": "astra1.8",
+        "build_options": {
+          "image_from": "debian:bullseye-slim",
+          "image_prepare_script": "install_apt.sh"
+        }
       },
-      "ppa_filters": ["astra1.8"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["astra1.8"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Debian 10": {
       "enabled": true,
       "codename": "buster",
-      "docker_dir": "linux_desktop",
-      "docker_image": "debian",
-      "docker_build_options": {
-        "image_from": "debian:buster-slim",
-        "image_prepare_script": "install_apt.sh"
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "debian",
+        "build_options": {
+          "image_from": "debian:buster-slim",
+          "image_prepare_script": "install_apt.sh"
+        }
       },
-      "ppa_filters": ["debian10", "raspbian10"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian10", "raspbian10"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Debian 11": {
       "enabled": true,
       "codename": "bullseye",
-      "docker_dir": "linux_desktop",
-      "docker_image": "debian11",
-      "docker_build_options": {
-        "image_from": "debian:bullseye-slim",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "debian11",
+        "build_options": {
+          "image_from": "debian:bullseye-slim",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["debian11"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian11"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Debian 12": {
       "enabled": true,
       "codename": "bookworm",
-      "docker_dir": "linux_desktop",
-      "docker_image": "debian12",
-      "docker_build_options": {
-        "image_from": "debian:bookworm-slim",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "debian12",
+        "build_options": {
+          "image_from": "debian:bookworm-slim",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["debian12"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian12"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Debian 13": {
       "enabled": true,
       "ondemand": true,
       "codename": "trixie",
-      "docker_dir": "linux_desktop",
-      "docker_image": "debian13",
-      "docker_build_options": {
-        "image_from": "debian:trixie-slim",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false,
-		"VERSION_ID": "13"
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "debian13",
+        "build_options": {
+          "image_from": "debian:trixie-slim",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false,
+          "VERSION_ID": "13"
+        }
       },
-      "ppa_filters": ["debian13"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian13"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Ubuntu 20.04": {
       "enabled": true,
       "codename": "focal",
-      "docker_dir": "linux_desktop",
-      "docker_image": "ubuntu",
-      "docker_from": "ubuntu:20.04",
-      "docker_build_options": {
-        "image_from": "ubuntu:20.04",
-        "image_prepare_script": "install_apt.sh"
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "ubuntu",
+        "build_options": {
+          "image_from": "ubuntu:20.04",
+          "image_prepare_script": "install_apt.sh"
+        }
       },
-      "ppa_filters": ["ubuntu20.04"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb [arch=amd64] https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["ubuntu20.04"],
+        "install_instructions": "ubuntu_old"
+      }
     },
+	
     "Ubuntu 22.04": {
       "enabled": true,
       "codename": "jammy",
-      "docker_dir": "linux_desktop",
-      "docker_image": "ubuntu22.04",
-      "docker_build_options": {
-        "image_from": "ubuntu:22.04",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "ubuntu22.04",
+        "build_options": {
+          "image_from": "ubuntu:22.04",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["ubuntu22.04"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb [arch=amd64] https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["ubuntu22.04"],
+        "install_instructions": "ubuntu_old"
+      }
     },
+	
     "Ubuntu 24.04": {
       "enabled": true,
       "codename": "noble",
-      "docker_dir": "linux_desktop",
-      "docker_image": "ubuntu24.04",
-      "docker_build_options": {
-        "image_from": "ubuntu:24.04",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "ubuntu24.04",
+        "build_options": {
+          "image_from": "ubuntu:24.04",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["ubuntu24.04"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["ubuntu24.04"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Ubuntu 22.10": {
       "enabled": false,
       "codename": "kinetic",
-      "docker_dir": "linux_desktop",
-      "docker_image": "ubuntu22.10",
-      "docker_build_options": {
-        "image_from": "ubuntu:22.10",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "ubuntu22.10",
+        "build_options": {
+          "image_from": "ubuntu:22.10",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["ubuntu22.10"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["ubuntu22.10"],
+        "install_instructions": "debian_new"
+      }
     },
+	
 	"Ubuntu 23.04": {
       "enabled": false,
       "codename": "lunar",
-      "docker_dir": "linux_desktop",
-      "docker_image": "ubuntu23.04",
-      "docker_build_options": {
-        "image_from": "ubuntu:23.04",
-        "image_prepare_script": "install_apt.sh",
-        "QT_FROM_SOURCE": false
+      "docker": {
+        "directory": "linux_desktop",
+        "image_basename": "ubuntu23.04",
+        "build_options": {
+          "image_from": "ubuntu:23.04",
+          "image_prepare_script": "install_apt.sh",
+          "QT_FROM_SOURCE": false
+        }
       },
-      "ppa_filters": ["ubuntu23.04"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["ubuntu23.04"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Debian 11 armhf": {
       "enabled": true,
       "codename": "bullseye",
-      "docker_dir": "linux_cross",
-      "docker_image": "debian11_armhf",
-      "docker_build_options": {
-        "image_from": "debian:bullseye-slim",
-        "image_prepare_script": "install_apt.sh",
-        "arch": "armhf",
-        "toolchain": "g++-arm-linux-gnueabihf",
-        "triplet": "arm-linux-gnueabihf",
-		"support_gl": 0
+      "docker": {
+        "directory": "linux_cross",
+        "image_basename": "debian11_armhf",
+        "build_options": {
+          "image_from": "debian:bullseye-slim",
+          "image_prepare_script": "install_apt.sh",
+          "arch": "armhf",
+          "toolchain": "g++-arm-linux-gnueabihf",
+          "triplet": "arm-linux-gnueabihf",
+		  "support_gl": 0
+        }
       },
       "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa_filters": ["debian11"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian11"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Debian 11 arm64": {
       "enabled": true,
       "codename": "bullseye",
-      "docker_dir": "linux_cross",
-      "docker_image": "debian11_arm64",
-      "docker_build_options": {
-        "image_from": "debian:bullseye-slim",
-        "image_prepare_script": "install_apt.sh",
-        "arch": "arm64",
-        "toolchain": "g++-aarch64-linux-gnu",
-        "triplet": "aarch64-linux-gnu"
+      "docker": {
+        "directory": "linux_cross",
+        "image_basename": "debian11_arm64",
+        "build_options": {
+          "image_from": "debian:bullseye-slim",
+          "image_prepare_script": "install_apt.sh",
+          "arch": "arm64",
+          "toolchain": "g++-aarch64-linux-gnu",
+          "triplet": "aarch64-linux-gnu"
+        }
       },
       "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa_filters": ["debian11"],
-      "ppa_instructions": [
-        "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-        "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian11"],
+        "install_instructions": "debian_old"
+      }
     },
+	
     "Debian 12 armhf": {
       "enabled": true,
       "codename": "bookworm",
-      "docker_dir": "linux_cross",
-      "docker_image": "debian12_armhf",
-      "docker_build_options": {
-        "image_from": "debian:bookworm-slim",
-        "image_prepare_script": "install_apt.sh",
-        "arch": "armhf",
-        "toolchain": "g++-arm-linux-gnueabihf",
-        "triplet": "arm-linux-gnueabihf",
-		"support_gl": 0
+      "docker": {
+        "directory": "linux_cross",
+        "image_basename": "debian12_armhf",
+        "build_options": {
+          "image_from": "debian:bookworm-slim",
+          "image_prepare_script": "install_apt.sh",
+          "arch": "armhf",
+          "toolchain": "g++-arm-linux-gnueabihf",
+          "triplet": "arm-linux-gnueabihf",
+		  "support_gl": 0
+        }
       },
       "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa_filters": ["debian12"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian12"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Debian 12 arm64": {
       "enabled": true,
       "codename": "bookworm",
-      "docker_dir": "linux_cross",
-      "docker_image": "debian12_arm64",
-      "docker_build_options": {
-        "image_from": "debian:bookworm-slim",
-        "image_prepare_script": "install_apt.sh",
-        "arch": "arm64",
-        "toolchain": "g++-aarch64-linux-gnu",
-        "triplet": "aarch64-linux-gnu"
+      "docker": {
+        "directory": "linux_cross",
+        "image_basename": "debian12_arm64",
+        "build_options": {
+          "image_from": "debian:bookworm-slim",
+          "image_prepare_script": "install_apt.sh",
+          "arch": "arm64",
+          "toolchain": "g++-aarch64-linux-gnu",
+          "triplet": "aarch64-linux-gnu"
+        }
       },
       "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa_filters": ["debian12"],
-      "ppa_instructions": [
-        "sudo apt-get install -y ca-certificates curl gpg",
-        "sudo install -m 0755 -d /etc/apt/keyrings",
-        "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-      ]
+      "ppa": {
+        "filters": ["debian12"],
+        "install_instructions": "debian_new"
+      }
     },
+	
     "Windows x64": {
       "enabled": true,
-      "docker_dir": "windows",
-      "docker_image": "windows",
-      "docker_build_options": {},
+      "docker": {
+        "directory": "windows",
+        "image_basename": "windows",
+        "build_options": {}
+      },
       "cmake_toolchain": "/soft/toolchain-Windows.cmake"
     },
+	
     "Windows x32": {
       "enabled": true,
-      "docker_dir": "windows32",
-      "docker_image": "windows32",
-      "docker_build_options": {},
+      "docker": {
+        "directory": "windows32",
+        "image_basename": "windows32",
+        "build_options": {}
+      },
       "cmake_toolchain": "/soft/toolchain-Windows32.cmake"
     },
+	
     "OSX": {
       "enabled": false,
-      "docker_dir": "osx",
-      "docker_image": "osx",
-      "docker_build_options": {},
+      "docker": {
+        "directory": "osx",
+        "image_basename": "osx",
+        "build_options": {}
+      },
       "cmake_toolchain": "/soft/toolchain-Darwin.cmake"
     },
+	
     "Raspbian 10": {
       "enabled": true,
-      "docker_dir": "pi",
-      "docker_image": "pi",
-      "docker_build_options": {},
+      "docker": {
+        "directory": "pi",
+        "image_basename": "pi",
+        "build_options": {}
+      },
       "cmake_toolchain": "/soft/toolchain-RPi.cmake"
     },
+	
     "Android": {
       "enabled": true,
-      "docker_dir": "android",
-      "docker_image": "android",
-      "docker_build_options": {
-        "QT_DOWNLOAD_SERVER": "172.17.0.1",
-		"NDK_PLATFORM": "21"
+      "docker": {
+        "directory": "android",
+        "image_basename": "android",
+        "build_options": {
+          "QT_DOWNLOAD_SERVER": "172.17.0.1",
+		  "NDK_PLATFORM": "21"
+        }
       },
       "cmake_toolchain": "/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake"
     }
+	
   }
 }
diff --git a/platforms_new.json b/platforms_new.json
deleted file mode 100644
index ed6129c..0000000
--- a/platforms_new.json
+++ /dev/null
@@ -1,363 +0,0 @@
-{
-  "install_instructions": {
-	  
-    "debian_old": [
-      "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-      "echo \"deb https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-    ],
-    
-	"debian_new":[
-      "sudo apt-get install -y ca-certificates curl gpg",
-      "sudo install -m 0755 -d /etc/apt/keyrings",
-      "curl -fsSL https://ppa.${domain}/SHS.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/SHS.gpg",
-      "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/SHS.gpg] https://ppa.${domain} ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-    ],
-    
-	"ubuntu_old": [
-      "wget -qO - https://ppa.${domain}/SHS.gpg | sudo apt-key add -",
-      "echo \"deb [arch=amd64] https://ppa.${domain}/ ${codename} main\" | sudo tee /etc/apt/sources.list.d/SHS.list"
-    ]
-	
-  },
-  
-  "platforms": {
-	  
-    "Astra Linux 1.7": {
-      "enabled": true,
-      "ondemand": true,
-      "codename": "astra1.7",
-      "docker": {
-        "directory": "astra1.7",
-        "image_basename": "astra1.7",
-        "build_options": {
-          "image_from": "debian:buster-slim",
-          "image_prepare_script": "install_apt.sh"
-        }
-      },
-      "ppa": {
-        "filters": ["astra1.7"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Astra Linux 1.8": {
-      "enabled": true,
-      "ondemand": true,
-      "codename": "astra1.8",
-      "docker": {
-        "directory": "astra1.8",
-        "image_basename": "astra1.8",
-        "build_options": {
-          "image_from": "debian:bullseye-slim",
-          "image_prepare_script": "install_apt.sh"
-        }
-      },
-      "ppa": {
-        "filters": ["astra1.8"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Debian 10": {
-      "enabled": true,
-      "codename": "buster",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "debian",
-        "build_options": {
-          "image_from": "debian:buster-slim",
-          "image_prepare_script": "install_apt.sh"
-        }
-      },
-      "ppa": {
-        "filters": ["debian10", "raspbian10"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Debian 11": {
-      "enabled": true,
-      "codename": "bullseye",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "debian11",
-        "build_options": {
-          "image_from": "debian:bullseye-slim",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["debian11"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Debian 12": {
-      "enabled": true,
-      "codename": "bookworm",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "debian12",
-        "build_options": {
-          "image_from": "debian:bookworm-slim",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["debian12"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Debian 13": {
-      "enabled": true,
-      "ondemand": true,
-      "codename": "trixie",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "debian13",
-        "build_options": {
-          "image_from": "debian:trixie-slim",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false,
-          "VERSION_ID": "13"
-        }
-      },
-      "ppa": {
-        "filters": ["debian13"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Ubuntu 20.04": {
-      "enabled": true,
-      "codename": "focal",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "ubuntu",
-        "build_options": {
-          "image_from": "ubuntu:20.04",
-          "image_prepare_script": "install_apt.sh"
-        }
-      },
-      "ppa": {
-        "filters": ["ubuntu20.04"],
-        "install_instructions": "ubuntu_old"
-      }
-    },
-	
-    "Ubuntu 22.04": {
-      "enabled": true,
-      "codename": "jammy",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "ubuntu22.04",
-        "build_options": {
-          "image_from": "ubuntu:22.04",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["ubuntu22.04"],
-        "install_instructions": "ubuntu_old"
-      }
-    },
-	
-    "Ubuntu 24.04": {
-      "enabled": true,
-      "codename": "noble",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "ubuntu24.04",
-        "build_options": {
-          "image_from": "ubuntu:24.04",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["ubuntu24.04"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Ubuntu 22.10": {
-      "enabled": false,
-      "codename": "kinetic",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "ubuntu22.10",
-        "build_options": {
-          "image_from": "ubuntu:22.10",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["ubuntu22.10"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-	"Ubuntu 23.04": {
-      "enabled": false,
-      "codename": "lunar",
-      "docker": {
-        "directory": "linux_desktop",
-        "image_basename": "ubuntu23.04",
-        "build_options": {
-          "image_from": "ubuntu:23.04",
-          "image_prepare_script": "install_apt.sh",
-          "QT_FROM_SOURCE": false
-        }
-      },
-      "ppa": {
-        "filters": ["ubuntu23.04"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Debian 11 armhf": {
-      "enabled": true,
-      "codename": "bullseye",
-      "docker": {
-        "directory": "linux_cross",
-        "image_basename": "debian11_armhf",
-        "build_options": {
-          "image_from": "debian:bullseye-slim",
-          "image_prepare_script": "install_apt.sh",
-          "arch": "armhf",
-          "toolchain": "g++-arm-linux-gnueabihf",
-          "triplet": "arm-linux-gnueabihf",
-		  "support_gl": 0
-        }
-      },
-      "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa": {
-        "filters": ["debian11"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Debian 11 arm64": {
-      "enabled": true,
-      "codename": "bullseye",
-      "docker": {
-        "directory": "linux_cross",
-        "image_basename": "debian11_arm64",
-        "build_options": {
-          "image_from": "debian:bullseye-slim",
-          "image_prepare_script": "install_apt.sh",
-          "arch": "arm64",
-          "toolchain": "g++-aarch64-linux-gnu",
-          "triplet": "aarch64-linux-gnu"
-        }
-      },
-      "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa": {
-        "filters": ["debian11"],
-        "install_instructions": "debian_old"
-      }
-    },
-	
-    "Debian 12 armhf": {
-      "enabled": true,
-      "codename": "bookworm",
-      "docker": {
-        "directory": "linux_cross",
-        "image_basename": "debian12_armhf",
-        "build_options": {
-          "image_from": "debian:bookworm-slim",
-          "image_prepare_script": "install_apt.sh",
-          "arch": "armhf",
-          "toolchain": "g++-arm-linux-gnueabihf",
-          "triplet": "arm-linux-gnueabihf",
-		  "support_gl": 0
-        }
-      },
-      "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa": {
-        "filters": ["debian12"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Debian 12 arm64": {
-      "enabled": true,
-      "codename": "bookworm",
-      "docker": {
-        "directory": "linux_cross",
-        "image_basename": "debian12_arm64",
-        "build_options": {
-          "image_from": "debian:bookworm-slim",
-          "image_prepare_script": "install_apt.sh",
-          "arch": "arm64",
-          "toolchain": "g++-aarch64-linux-gnu",
-          "triplet": "aarch64-linux-gnu"
-        }
-      },
-      "cmake_toolchain": "/soft/toolchain.cmake",
-      "ppa": {
-        "filters": ["debian12"],
-        "install_instructions": "debian_new"
-      }
-    },
-	
-    "Windows x64": {
-      "enabled": true,
-      "docker": {
-        "directory": "windows",
-        "image_basename": "windows",
-        "build_options": {}
-      },
-      "cmake_toolchain": "/soft/toolchain-Windows.cmake"
-    },
-	
-    "Windows x32": {
-      "enabled": true,
-      "docker": {
-        "directory": "windows32",
-        "image_basename": "windows32",
-        "build_options": {}
-      },
-      "cmake_toolchain": "/soft/toolchain-Windows32.cmake"
-    },
-	
-    "OSX": {
-      "enabled": false,
-      "docker": {
-        "directory": "osx",
-        "image_basename": "osx",
-        "build_options": {}
-      },
-      "cmake_toolchain": "/soft/toolchain-Darwin.cmake"
-    },
-	
-    "Raspbian 10": {
-      "enabled": true,
-      "docker": {
-        "directory": "pi",
-        "image_basename": "pi",
-        "build_options": {}
-      },
-      "cmake_toolchain": "/soft/toolchain-RPi.cmake"
-    },
-	
-    "Android": {
-      "enabled": true,
-      "docker": {
-        "directory": "android",
-        "image_basename": "android",
-        "build_options": {
-          "QT_DOWNLOAD_SERVER": "172.17.0.1",
-		  "NDK_PLATFORM": "21"
-        }
-      },
-      "cmake_toolchain": "/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake"
-    }
-	
-  }
-}