diff --git a/.dockerignore b/.dockerignore
index 3d8bf1c..c7533bb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 licences/
 .github/
+.vscode/
 LICENSE.md
 README.md
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..72c9ef5
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,24 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "dockerfile",
+            "request": "launch",
+            "name": "Docker: Build Alpine",
+            "dockerfile": "${workspaceFolder}/alpine/Dockerfile",
+            "contextPath": "${workspaceFolder}/alpine",
+            "args": ["-t", "docker-sqlcmd:alpine"]
+        },
+        {
+            "type": "dockerfile",
+            "request": "launch",
+            "name": "Docker: Build Ubuntu",
+            "dockerfile": "${workspaceFolder}/ubuntu/Dockerfile",
+            "contextPath": "${workspaceFolder}/ubuntu",
+            "args": ["-t", "docker-sqlcmd:ubuntu"]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 8b7ac37..9d2af15 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,7 +1,8 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 FROM ubuntu:$UBUNTU_VERSION
 
-ARG MSSQLTOOLS_VERSION=18.2.1.1
+# Check latest published version here: https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/m/mssql-tools18/
+ARG MSSQLTOOLS_VERSION=18.4.1.1-1
 # Microsoft decided to have a suffix for newer versions of mssql-tools, e.g. mssql-tools18
 ARG MSSQLTOOLS_SUFFIX=18
 # and also the path changed on newer versions. It's a mess.