diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh
index 35b55f288..9811b938a 100644
--- a/images/ubuntu/scripts/build/install-docker.sh
+++ b/images/ubuntu/scripts/build/install-docker.sh
@@ -64,27 +64,6 @@ systemctl is-enabled --quiet docker.service || systemctl enable docker.service
 sleep 10
 docker info
 
-if [[ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]]; then
-    # If credentials are provided, attempt to log into Docker Hub
-    # with a paid account to avoid Docker Hub's rate limit.
-    if [[ "${DOCKERHUB_LOGIN}" ]] && [[ "${DOCKERHUB_PASSWORD}" ]]; then
-        docker login --username "${DOCKERHUB_LOGIN}" --password "${DOCKERHUB_PASSWORD}"
-    fi
-
-    # Pull images
-    images=$(get_toolset_value '.docker.images[]')
-    for image in $images; do
-        docker pull "$image"
-    done
-
-    # Always attempt to logout so we do not leave our credentials on the built
-    # image. Logout _should_ return a zero exit code even if no credentials were
-    # stored from earlier.
-    docker logout
-else
-    echo "Skipping docker images pulling"
-fi
-
 # Download amazon-ecr-credential-helper
 aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest"
 aws_helper_url=$(curl -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}')
@@ -102,6 +81,3 @@ rm $GPG_KEY
 rm $REPO_PATH
 
 invoke_tests "Tools" "Docker"
-if [[ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]]; then
-    invoke_tests "Tools" "Docker images"
-fi
diff --git a/images/ubuntu/scripts/build/install-haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh
index b5a6b09c0..4af05755d 100644
--- a/images/ubuntu/scripts/build/install-haskell.sh
+++ b/images/ubuntu/scripts/build/install-haskell.sh
@@ -23,8 +23,8 @@ prepend_etc_environment_path $ghcup_bin
 
 available_versions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}')
 
-# Install 2 latest Haskell Major.Minor versions
-major_minor_versions=$(echo "$available_versions" | cut -d"." -f 1,2 | uniq | tail -n2)
+# Install latest Haskell Major.Minor version
+major_minor_versions=$(echo "$available_versions" | cut -d"." -f 1,2 | uniq | tail -n1)
 for major_minor_version in $major_minor_versions; do
     full_version=$(echo "$available_versions" | grep "$major_minor_version." | tail -n1)
     echo "install ghc version $full_version..."
diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
index c138501bc..4f4be1bee 100644
--- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
+++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -254,9 +254,6 @@ $androidTools.AddTable($(Build-AndroidTable))
 
 $androidTools.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable))
 
-if (-not $(Test-IsUbuntu24)) {
-    $installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData))
-}
 $installedSoftware.AddHeader("Installed apt packages").AddTable($(Get-AptPackages))
 
 $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/software-report.json" -Encoding UTF8NoBOM
diff --git a/images/ubuntu/scripts/tests/Haskell.Tests.ps1 b/images/ubuntu/scripts/tests/Haskell.Tests.ps1
index a620df5c3..18717ae12 100644
--- a/images/ubuntu/scripts/tests/Haskell.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Haskell.Tests.ps1
@@ -2,12 +2,6 @@ Describe "Haskell" {
     $GHCCommonPath = "/usr/local/.ghcup/ghc"
     $GHCVersions = Get-ChildItem -Path $GHCCommonPath | Where-Object { $_.Name -match "\d+\.\d+" }
 
-    $testCase = @{ GHCVersions = $GHCVersions }
-
-    It "GHC directory contains two version of GHC" -TestCases $testCase {
-        $GHCVersions.Count | Should -Be 2
-    }
-
     $testCases = $GHCVersions | ForEach-Object { @{ GHCPath = "${_}/bin/ghc"} }
 
     It "GHC version <GHCPath>" -TestCases $testCases {
diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
index a85d88dff..3200cef29 100644
--- a/images/ubuntu/scripts/tests/Tools.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -113,14 +113,6 @@ Describe "Docker" {
     }
 }
 
-Describe "Docker images" {
-    $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } }
-
-    It "<ImageName>" -TestCases $testCases {
-       sudo docker images "$ImageName" --format "{{.Repository}}" | Should -Not -BeNullOrEmpty
-    }
-}
-
 Describe "Ansible" {
     It "Ansible" {
         "ansible --version" | Should -ReturnZeroExitCode
diff --git a/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl
index e306c9e74..135af613f 100644
--- a/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl
+++ b/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl
@@ -162,7 +162,7 @@ build {
   }
 
   provisioner "shell" {
-    environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"]
+    environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts          = ["${path.root}/../scripts/build/install-docker.sh"]
   }
diff --git a/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl
index 781fcccf9..04dd1114e 100644
--- a/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl
+++ b/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl
@@ -151,7 +151,7 @@ provisioner "shell" {
   }
 
   provisioner "shell" {
-    environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_PULL_IMAGES=NO"]
+    environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts          = ["${path.root}/../scripts/build/install-docker.sh"]
   }
diff --git a/images/ubuntu/templates/variable.ubuntu.pkr.hcl b/images/ubuntu/templates/variable.ubuntu.pkr.hcl
index ef48d309d..685c6604b 100644
--- a/images/ubuntu/templates/variable.ubuntu.pkr.hcl
+++ b/images/ubuntu/templates/variable.ubuntu.pkr.hcl
@@ -132,14 +132,6 @@ variable "winrm_username" {         // The username used to connect to the VM vi
 }
 
 // Image related variables
-variable "dockerhub_login" {
-  type    = string
-  default = "${env("DOCKERHUB_LOGIN")}"
-}
-variable "dockerhub_password" {
-  type    = string
-  default = "${env("DOCKERHUB_PASSWORD")}"
-}
 variable "helper_script_folder" {
   type    = string
   default = "/imagegeneration/helpers"
diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json
index 5bd221abe..a3e5c96e1 100644
--- a/images/ubuntu/toolsets/toolset-2204.json
+++ b/images/ubuntu/toolsets/toolset-2204.json
@@ -7,7 +7,6 @@
             "platform_version": "22.04",
             "arch": "x64",
             "versions": [
-                "3.9.*",
                 "3.10.*",
                 "3.11.*",
                 "3.12.*",
@@ -77,8 +76,8 @@
     },
     "android": {
         "cmdline-tools": "commandlinetools-linux-9477386_latest.zip",
-        "platform_min_version": "31",
-        "build_tools_min_version": "31.0.0",
+        "platform_min_version": "34",
+        "build_tools_min_version": "34.0.0",
         "extra_list": [
             "android;m2repository",
             "google;m2repository",
@@ -94,7 +93,7 @@
         "ndk": {
             "default": "27",
             "versions": [
-                "26", "27"
+                "27", "28", "29"
             ]
         }
     },
@@ -215,23 +214,6 @@
     "brew": [
     ],
     "docker": {
-        "images": [
-            "alpine:3.16",
-            "alpine:3.17",
-            "alpine:3.18",
-            "alpine:3.19",
-            "debian:10",
-            "debian:11",
-            "moby/buildkit:latest",
-            "node:18",
-            "node:20",
-            "node:22",
-            "node:18-alpine",
-            "node:20-alpine",
-            "node:22-alpine",
-            "ubuntu:20.04",
-            "ubuntu:22.04"
-        ],
         "components": [
             {
                 "package": "containerd.io",
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
index aaa776c9a..52cdcfcf4 100644
--- a/images/ubuntu/toolsets/toolset-2404.json
+++ b/images/ubuntu/toolsets/toolset-2404.json
@@ -7,7 +7,6 @@
             "platform_version": "24.04",
             "arch": "x64",
             "versions": [
-                "3.9.*",
                 "3.10.*",
                 "3.11.*",
                 "3.12.*",
@@ -91,7 +90,7 @@
         "ndk": {
             "default": "27",
             "versions": [
-                "26", "27", "28", "29"
+                "27", "28", "29"
             ]
         }
     },
@@ -192,8 +191,6 @@
     "brew": [
     ],
     "docker": {
-        "images": [
-        ],
         "components": [
             {
                 "package": "containerd.io",