diff --git a/.devcontainer/030 - Windows 10 Pro/devcontainer.json b/.devcontainer/10/devcontainer.json
similarity index 79%
rename from .devcontainer/030 - Windows 10 Pro/devcontainer.json
rename to .devcontainer/10/devcontainer.json
index 573f6ab..bdc023e 100644
--- a/.devcontainer/030 - Windows 10 Pro/devcontainer.json	
+++ b/.devcontainer/10/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 10 Pro",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10"
+    "VERSION": "10",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json b/.devcontainer/10e/devcontainer.json
similarity index 80%
rename from .devcontainer/040 - Windows 10 Enterprise/devcontainer.json
rename to .devcontainer/10e/devcontainer.json
index b5ef076..e401fea 100644
--- a/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json	
+++ b/.devcontainer/10e/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 10 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10e"
+    "VERSION": "10e",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/050 - Windows 10 LTSC/devcontainer.json b/.devcontainer/10l/devcontainer.json
similarity index 79%
rename from .devcontainer/050 - Windows 10 LTSC/devcontainer.json
rename to .devcontainer/10l/devcontainer.json
index 30ced2a..25109bb 100644
--- a/.devcontainer/050 - Windows 10 LTSC/devcontainer.json	
+++ b/.devcontainer/10l/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 10 LTSC",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10l"
+    "VERSION": "10l",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json b/.devcontainer/11e/devcontainer.json
similarity index 80%
rename from .devcontainer/010 - Windows 11 Enterprise/devcontainer.json
rename to .devcontainer/11e/devcontainer.json
index 4e67f1a..c67781a 100644
--- a/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json	
+++ b/.devcontainer/11e/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 11 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11e"
+    "VERSION": "11e",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/020 - Windows 11 LTSC/devcontainer.json b/.devcontainer/11l/devcontainer.json
similarity index 79%
rename from .devcontainer/020 - Windows 11 LTSC/devcontainer.json
rename to .devcontainer/11l/devcontainer.json
index e93fbf1..6cda36c 100644
--- a/.devcontainer/020 - Windows 11 LTSC/devcontainer.json	
+++ b/.devcontainer/11l/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 11 LTSC",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11l"
+    "VERSION": "11l",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/180 - Tiny11/devcontainer.json b/.devcontainer/180 - Tiny11/devcontainer.json
deleted file mode 100644
index 0ed1384..0000000
--- a/.devcontainer/180 - Tiny11/devcontainer.json	
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Tiny11",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "tiny11"
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  }, 
-  "hostRequirements": {
-    "storage": "64gb"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/190 - Tiny11 Core/devcontainer.json b/.devcontainer/190 - Tiny11 Core/devcontainer.json
deleted file mode 100644
index 1873cbc..0000000
--- a/.devcontainer/190 - Tiny11 Core/devcontainer.json	
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Tiny11 Core",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "core11"
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  }, 
-  "hostRequirements": {
-    "storage": "64gb"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/200 - Tiny11 Nano/devcontainer.json b/.devcontainer/200 - Tiny11 Nano/devcontainer.json
deleted file mode 100644
index f05b707..0000000
--- a/.devcontainer/200 - Tiny11 Nano/devcontainer.json	
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Tiny11 Nano",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "nano11"
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  }, 
-  "hostRequirements": {
-    "storage": "64gb"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/170 - Windows Server 2003/devcontainer.json b/.devcontainer/2003/devcontainer.json
similarity index 77%
rename from .devcontainer/170 - Windows Server 2003/devcontainer.json
rename to .devcontainer/2003/devcontainer.json
index 14eb337..ffe7dc5 100644
--- a/.devcontainer/170 - Windows Server 2003/devcontainer.json	
+++ b/.devcontainer/2003/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2003",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2003"
+    "VERSION": "2003",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json b/.devcontainer/2008/devcontainer.json
similarity index 77%
rename from .devcontainer/160 - Windows Server 2008 R2/devcontainer.json
rename to .devcontainer/2008/devcontainer.json
index cca5f42..5930e9c 100644
--- a/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json	
+++ b/.devcontainer/2008/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2008 R2",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2008"
+    "VERSION": "2008",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json b/.devcontainer/2012/devcontainer.json
similarity index 79%
rename from .devcontainer/150 - Windows Server 2012 R2/devcontainer.json
rename to .devcontainer/2012/devcontainer.json
index d9d72f5..8d3519c 100644
--- a/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json	
+++ b/.devcontainer/2012/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2012 R2",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2012"
+    "VERSION": "2012",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/140 - Windows Server 2016/devcontainer.json b/.devcontainer/2016/devcontainer.json
similarity index 79%
rename from .devcontainer/140 - Windows Server 2016/devcontainer.json
rename to .devcontainer/2016/devcontainer.json
index f611b12..2ede9d5 100644
--- a/.devcontainer/140 - Windows Server 2016/devcontainer.json	
+++ b/.devcontainer/2016/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2016",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2016"
+    "VERSION": "2016",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/130 - Windows Server 2019/devcontainer.json b/.devcontainer/2019/devcontainer.json
similarity index 79%
rename from .devcontainer/130 - Windows Server 2019/devcontainer.json
rename to .devcontainer/2019/devcontainer.json
index 333902b..68e2829 100644
--- a/.devcontainer/130 - Windows Server 2019/devcontainer.json	
+++ b/.devcontainer/2019/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2019",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2019"
+    "VERSION": "2019",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/120 - Windows Server 2022/devcontainer.json b/.devcontainer/2022/devcontainer.json
similarity index 79%
rename from .devcontainer/120 - Windows Server 2022/devcontainer.json
rename to .devcontainer/2022/devcontainer.json
index 4994c5f..5c66d43 100644
--- a/.devcontainer/120 - Windows Server 2022/devcontainer.json	
+++ b/.devcontainer/2022/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2022",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2022"
+    "VERSION": "2022",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/110 - Windows Server 2025/devcontainer.json b/.devcontainer/2025/devcontainer.json
similarity index 79%
rename from .devcontainer/110 - Windows Server 2025/devcontainer.json
rename to .devcontainer/2025/devcontainer.json
index 2ef30e8..f5b2984 100644
--- a/.devcontainer/110 - Windows Server 2025/devcontainer.json	
+++ b/.devcontainer/2025/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows Server 2025",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2025"
+    "VERSION": "2025",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/210 - Tiny10/devcontainer.json b/.devcontainer/210 - Tiny10/devcontainer.json
deleted file mode 100644
index 5039698..0000000
--- a/.devcontainer/210 - Tiny10/devcontainer.json	
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Tiny10",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "tiny10"
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  }, 
-  "hostRequirements": {
-    "storage": "64gb"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/100 - Windows 2000 Professional/devcontainer.json b/.devcontainer/2k/devcontainer.json
similarity index 77%
rename from .devcontainer/100 - Windows 2000 Professional/devcontainer.json
rename to .devcontainer/2k/devcontainer.json
index 9ee27cb..2aa0e55 100644
--- a/.devcontainer/100 - Windows 2000 Professional/devcontainer.json	
+++ b/.devcontainer/2k/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 2000 Professional",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2k"
+    "VERSION": "2k",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json b/.devcontainer/7u/devcontainer.json
similarity index 68%
rename from .devcontainer/080 - Windows Vista Ultimate/devcontainer.json
rename to .devcontainer/7u/devcontainer.json
index 2cdfe89..ac4314c 100644
--- a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json	
+++ b/.devcontainer/7u/devcontainer.json
@@ -1,8 +1,11 @@
 {
-  "name": "Windows Vista Ultimate",
+  "name": "Windows 7 Ultimate (64-bit)",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "vu"
+    "VERSION": "7u",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/090 - Windows XP Professional/devcontainer.json b/.devcontainer/7u32/devcontainer.json
similarity index 68%
rename from .devcontainer/090 - Windows XP Professional/devcontainer.json
rename to .devcontainer/7u32/devcontainer.json
index 1e375ff..612ddc2 100644
--- a/.devcontainer/090 - Windows XP Professional/devcontainer.json	
+++ b/.devcontainer/7u32/devcontainer.json
@@ -1,8 +1,11 @@
 {
-  "name": "Windows XP Professional",
+  "name": "Windows 7 Ultimate (32-bit)",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "xp"
+    "VERSION": "7ux86",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json b/.devcontainer/8e/devcontainer.json
similarity index 80%
rename from .devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json
rename to .devcontainer/8e/devcontainer.json
index 41870d0..d27348b 100644
--- a/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json	
+++ b/.devcontainer/8e/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 8.1 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "8e"
+    "VERSION": "8e",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/codespaces.yml b/.devcontainer/codespaces.yml
index f9682d1..7aaba65 100644
--- a/.devcontainer/codespaces.yml
+++ b/.devcontainer/codespaces.yml
@@ -4,8 +4,7 @@ services:
     container_name: windows
     environment:
       VERSION: "11"
-      ALLOCATE: "Y"
-      RAM_SIZE: "half"
+      RAM_SIZE: "max"
       DISK_SIZE: "max"
       CPU_CORES: "max"
     devices:
diff --git a/.devcontainer/core11/devcontainer.json b/.devcontainer/core11/devcontainer.json
new file mode 100644
index 0000000..44ba15f
--- /dev/null
+++ b/.devcontainer/core11/devcontainer.json
@@ -0,0 +1,24 @@
+{
+  "name": "Tiny 11 Core",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "core11",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  }, 
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5de96d5..7a9ad96 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,10 @@
   "name": "Windows 11 Pro",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11"
+    "VERSION": "11",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"
   },
   "forwardPorts": [8006],
   "portsAttributes": {
diff --git a/.devcontainer/nano11/devcontainer.json b/.devcontainer/nano11/devcontainer.json
new file mode 100644
index 0000000..a5ea04a
--- /dev/null
+++ b/.devcontainer/nano11/devcontainer.json
@@ -0,0 +1,24 @@
+{
+  "name": "Tiny 11 Nano",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "nano11",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  }, 
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/tiny10/devcontainer.json b/.devcontainer/tiny10/devcontainer.json
new file mode 100644
index 0000000..9b7dd6b
--- /dev/null
+++ b/.devcontainer/tiny10/devcontainer.json
@@ -0,0 +1,24 @@
+{
+  "name": "Tiny 10",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "tiny10",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  }, 
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/tiny11/devcontainer.json b/.devcontainer/tiny11/devcontainer.json
new file mode 100644
index 0000000..a659705
--- /dev/null
+++ b/.devcontainer/tiny11/devcontainer.json
@@ -0,0 +1,24 @@
+{
+  "name": "Tiny 11",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "tiny11",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  }, 
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/vu/devcontainer.json b/.devcontainer/vu/devcontainer.json
new file mode 100644
index 0000000..2b9e871
--- /dev/null
+++ b/.devcontainer/vu/devcontainer.json
@@ -0,0 +1,21 @@
+{
+  "name": "Windows Vista Ultimate (64-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "vu",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/vu32/devcontainer.json b/.devcontainer/vu32/devcontainer.json
new file mode 100644
index 0000000..7c5be1c
--- /dev/null
+++ b/.devcontainer/vu32/devcontainer.json
@@ -0,0 +1,21 @@
+{
+  "name": "Windows Vista Ultimate (32-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "vux86",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json b/.devcontainer/xp/devcontainer.json
similarity index 69%
rename from .devcontainer/070 - Windows 7 Ultimate/devcontainer.json
rename to .devcontainer/xp/devcontainer.json
index ffaf504..d7a8dfd 100644
--- a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json	
+++ b/.devcontainer/xp/devcontainer.json
@@ -1,8 +1,11 @@
 {
-  "name": "Windows 7 Ultimate",
+  "name": "Windows XP (32-bit)",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "7u"
+    "VERSION": "xp",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/xp64/devcontainer.json b/.devcontainer/xp64/devcontainer.json
new file mode 100644
index 0000000..a03df31
--- /dev/null
+++ b/.devcontainer/xp64/devcontainer.json
@@ -0,0 +1,21 @@
+{
+  "name": "Windows XP (64-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "xp64",
+    "RAM_SIZE": "max",
+    "DISK_SIZE": "max",
+    "CPU_CORES": "max"    
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.dockerignore b/.dockerignore
index 154d44a..258778b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 .dockerignore
-.devcontainer
 .git
 .github
 .gitignore
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 9e9d278..788a2b0 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,29 +7,19 @@ jobs:
     name: shellcheck
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v5
-      -
-        name: Run ShellCheck
+      - uses: actions/checkout@v5
+      - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         env:
           SHELLCHECK_OPTS: -x --source-path=src -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028
-      -
-        name: Lint Dockerfile
+      - name: Validate XML
+        uses: action-pack/valid-xml@v1
+        with:
+         path: "assets"
+         file-endings: ".xml"
+      - name: Lint Dockerfile
         uses: hadolint/hadolint-action@v3.3.0
         with:
           dockerfile: Dockerfile
           ignore: DL3006,DL3008
           failure-threshold: warning
-      -
-        name: Validate XML
-        uses: action-pack/valid-xml@v1
-        with:
-         path: "assets"
-         file-endings: ".xml"
-      -
-        name: Validate JSON and YML files
-        uses: GrantBirki/json-yaml-validate@v4
-        with:
-          yaml_exclude_regex: ".*\\kubernetes\\.yml$"
diff --git a/Dockerfile b/Dockerfile
index 1f8a231..9fa65be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
 
-COPY --from=qemux/qemu:7.25 / /
+COPY --from=qemux/qemu:7.24 / /
 
 ARG TARGETARCH
 ARG DEBCONF_NOWARNINGS="yes"
@@ -27,7 +27,7 @@ RUN set -eu && \
 COPY --chmod=755 ./src /run/
 COPY --chmod=755 ./assets /run/assets
 
-ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.48-0/virtio-win-1.9.48.tar.xz /var/drivers.txz
+ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.47-0/virtio-win-1.9.47.tar.xz /var/drivers.txz
 
 FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64
 FROM build-${TARGETARCH}
diff --git a/src/entry.sh b/src/entry.sh
index 2929503..1b440a0 100644
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -22,9 +22,7 @@ cd /run
 . boot.sh       # Configure boot
 . proc.sh       # Initialize processor
 . power.sh      # Configure shutdown
-. memory.sh     # Check available memory
 . config.sh     # Configure arguments
-. finish.sh     # Finish initialization
 
 trap - ERR