diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 030bfec07..d09faa335 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -49,13 +49,13 @@ $runtimesList = @(
     (Get-JuliaVersion),
     (Get-ClangVersions),
     (Get-ClangFormatVersions),
-    (Get-ClangTidyVersions)
+    (Get-ClangTidyVersions),
+    (Get-KotlinVersion)
 )
 
 if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
     $runtimesList += @(
         (Get-MsbuildVersion),
-        (Get-KotlinVersion),
         (Get-MonoVersion),
         (Get-ErlangVersion),
         (Get-ErlangRebar3Version),
@@ -128,6 +128,7 @@ $toolsList = @(
     (Get-GitFTPVersion),
     (Get-HavegedVersion),
     (Get-HerokuVersion),
+    (Get-LeiningenVersion),
     (Get-SVNVersion),
     (Get-JqVersion),
     (Get-YqVersion),
@@ -154,7 +155,6 @@ $toolsList = @(
 if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
     $toolsList += @(
         (Get-PhantomJSVersion),
-        (Get-LeiningenVersion),
         (Get-HHVMVersion)
     )
 }
@@ -229,14 +229,14 @@ $markdown += New-MDHeader "Browsers and Drivers" -Level 3
 $browsersAndDriversList = @(
     (Get-ChromeVersion),
     (Get-ChromeDriverVersion),
-    (Get-ChromiumVersion)
+    (Get-ChromiumVersion),
+    (Get-SeleniumVersion)
 )
 
 if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
     $browsersAndDriversList += @(
         (Get-FirefoxVersion),
-        (Get-GeckodriverVersion),
-        (Get-SeleniumVersion)
+        (Get-GeckodriverVersion)
     )
 }
 
@@ -293,14 +293,12 @@ $markdown += New-MDList -Style Unordered -Lines @(
 
 $markdown += Build-WebServersSection
 
-if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
-    $markdown += New-MDHeader "Android" -Level 3
-    $markdown += Build-AndroidTable | New-MDTable
-    $markdown += New-MDNewLine
-    $markdown += New-MDHeader "Environment variables" -Level 4
-    $markdown += Build-AndroidEnvironmentTable | New-MDTable
-    $markdown += New-MDNewLine
-}
+$markdown += New-MDHeader "Android" -Level 3
+$markdown += Build-AndroidTable | New-MDTable
+$markdown += New-MDNewLine
+$markdown += New-MDHeader "Environment variables" -Level 4
+$markdown += Build-AndroidEnvironmentTable | New-MDTable
+$markdown += New-MDNewLine
 
 $markdown += New-MDHeader "Cached Docker images" -Level 3
 $markdown += Get-CachedDockerImagesTableData | New-MDTable
diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1
index 028ea5518..3d530a0b9 100644
--- a/images/linux/scripts/tests/Android.Tests.ps1
+++ b/images/linux/scripts/tests/Android.Tests.ps1
@@ -1,6 +1,4 @@
 Describe "Android" {
-    if (Test-IsUbuntu22) { return }
-
     $androidSdkManagerPackages = Get-AndroidPackages
     [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
     [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1
index 16a7e57cf..a155221e6 100644
--- a/images/linux/scripts/tests/Tools.Tests.ps1
+++ b/images/linux/scripts/tests/Tools.Tests.ps1
@@ -206,7 +206,7 @@ Describe "Sbt" {
     }
 }
 
-Describe "Selenium" -Skip:(Test-IsUbuntu22) {
+Describe "Selenium" {
     It "Selenium is installed" {
         $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name
         $seleniumPath = Join-Path "/usr/share/java" "$seleniumBinaryName.jar"
@@ -298,7 +298,7 @@ Describe "Kubernetes tools" {
     }
 }
 
-Describe "Leiningen" -Skip:(Test-IsUbuntu22) {
+Describe "Leiningen" {
     It "leiningen" {
         "lein --version" | Should -ReturnZeroExitCode
     }
@@ -397,7 +397,7 @@ Describe "yq" {
     }
 }
 
-Describe "Kotlin" -Skip:(Test-IsUbuntu22) {
+Describe "Kotlin" {
     It "kapt" {
         "kapt -version"| Should -ReturnZeroExitCode
     }
diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json
index 213080d04..8bea46597 100644
--- a/images/linux/toolsets/toolset-2204.json
+++ b/images/linux/toolsets/toolset-2204.json
@@ -87,9 +87,9 @@
             "cmake;3.18.1"
         ],
         "ndk": {
-            "default": "21",
+            "default": "23",
             "versions": [
-                "21", "22", "23"
+                "21", "23", "24"
             ]
         }
     },
diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl
index dffb9c3f3..22c5ae652 100644
--- a/images/linux/ubuntu2204.pkr.hcl
+++ b/images/linux/ubuntu2204.pkr.hcl
@@ -290,7 +290,9 @@ build {
                         "${path.root}/scripts/installers/java-tools.sh",
                         "${path.root}/scripts/installers/kubernetes-tools.sh",
                         "${path.root}/scripts/installers/oc.sh",
+                        "${path.root}/scripts/installers/leiningen.sh",
                         "${path.root}/scripts/installers/miniconda.sh",
+                        "${path.root}/scripts/installers/kotlin.sh",
                         "${path.root}/scripts/installers/mysql.sh",
                         "${path.root}/scripts/installers/sqlpackage.sh",
                         "${path.root}/scripts/installers/nginx.sh",
@@ -306,10 +308,12 @@ build {
                         "${path.root}/scripts/installers/rust.sh",
                         "${path.root}/scripts/installers/julia.sh",
                         "${path.root}/scripts/installers/sbt.sh",
+                        "${path.root}/scripts/installers/selenium.sh",
                         "${path.root}/scripts/installers/terraform.sh",
                         "${path.root}/scripts/installers/packer.sh",
                         "${path.root}/scripts/installers/vcpkg.sh",
                         "${path.root}/scripts/installers/dpkg-config.sh",
+                        "${path.root}/scripts/installers/android.sh",
                         "${path.root}/scripts/installers/yq.sh",
                         "${path.root}/scripts/installers/pypy.sh",
                         "${path.root}/scripts/installers/python.sh",