diff --git a/.github/actions/podman-setup/action.yml b/.github/actions/podman-setup/action.yml
index 99b07a35d..671c29da3 100644
--- a/.github/actions/podman-setup/action.yml
+++ b/.github/actions/podman-setup/action.yml
@@ -6,10 +6,14 @@ runs:
     - name: Podman setup
       shell: bash
       run: |
-        curl -fsSL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key" | gpg --dearmor | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
-        echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
         sudo apt-get update
-        sudo apt-get -y install podman
+        sudo apt-get install -y --only-upgrade podman golang-github-containers-common
+        dpkg-query -W podman golang-github-containers-common
+        mkdir -p ~/.config/containers
+        cat <<EOF > ~/.config/containers/containers.conf
+        [engine]
+        runtime = "runc"
+        EOF
         systemctl enable --now --user podman podman.socket
         podman info
         echo "DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 7644dd321..f9efaf7c7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -21,7 +21,7 @@ concurrency:
 jobs:
   detect-modules:
     name: Detect packages to check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       modules: ${{ steps.set-modified-modules.outputs.modules }}
       modules_count: ${{ steps.set-modified-modules-count.outputs.modules_count }}
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
         uses: actions/checkout@v5
@@ -61,7 +61,7 @@ jobs:
         id: npm-install-modules
         uses: ./.github/actions/npm-setup
         with:
-          runner: ubuntu-22.04
+          runner: ubuntu-24.04
           node-version: 24.x
           workspace: "${{ matrix.module }}"
       - name: Code linting
@@ -79,7 +79,7 @@ jobs:
       fail-fast: false
       matrix:
         module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
         uses: actions/checkout@v5
@@ -87,7 +87,7 @@ jobs:
         id: npm-install
         uses: ./.github/actions/npm-setup
         with:
-          runner: ubuntu-22.04
+          runner: ubuntu-24.04
           node-version: 24.x
           workspace: "${{ matrix.module }}"
       - name: Compile
@@ -108,14 +108,14 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [20.x, 22.x, 24.x]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Code checkout
         uses: actions/checkout@v5
       - name: Install Node ${{ matrix.node-version }} and Dependencies
         uses: ./.github/actions/npm-setup
         with:
-          runner: ubuntu-22.04
+          runner: ubuntu-24.04
           node-version: ${{ matrix.node-version }}
           workspace: "testcontainers"
       - name: Build testcontainers
@@ -147,7 +147,7 @@ jobs:
         container-runtime: [docker, podman]
     uses: ./.github/workflows/test-template.yml
     with:
-      runner: ubuntu-22.04
+      runner: ubuntu-24.04
       node-version: ${{ matrix.node-version }}
       container-runtime: ${{ matrix.container-runtime }}
       workspace: "${{ matrix.module }}"
@@ -161,7 +161,7 @@ jobs:
       - compile
       - smoke-test
       - test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check if any jobs failed
         if: ${{ failure() || cancelled() }}
diff --git a/.github/workflows/close-inactive-issues.yml b/.github/workflows/close-inactive-issues.yml
index 2708a4b46..06f8ab894 100644
--- a/.github/workflows/close-inactive-issues.yml
+++ b/.github/workflows/close-inactive-issues.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   close-issues:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
       pull-requests: write
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 006b85433..6521baa8d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 25ab4414a..86a2aac9b 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -7,7 +7,7 @@ permissions:
 jobs:
   dependency-review:
     name: Run
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout Repository"
         uses: actions/checkout@v5
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index ed467a3c2..28c2a0686 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
         with:
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index b2a14c2ba..2882275c6 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   update_release_draft:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "main"
       - uses: release-drafter/release-drafter@v6
diff --git a/.github/workflows/windows-test-command-dispatch.yml b/.github/workflows/windows-test-command-dispatch.yml
index 89c742615..5eb5a6409 100644
--- a/.github/workflows/windows-test-command-dispatch.yml
+++ b/.github/workflows/windows-test-command-dispatch.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   windows-test-command-dispatch:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Dispatch windows-test command
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml
index ad2188dc8..1ea2cb73d 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml
@@ -1,11 +1 @@
-version: 3
-
-services:
-  container:
-    image: cristianrgreco/testcontainer:1.1.14
-    ports:
-      - 8080
-  another-container:
-    image: cristianrgreco/testcontainer:1.1.14
-    ports:
-      - 8080
+MALFORMED
\ No newline at end of file
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml
index 6ee1b7ab7..196a9dcc2 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml
index 6ee1b7ab7..196a9dcc2 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml
index 4e33bdbe2..40cf54923 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml
index 160da896b..2c14b6a63 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml
index 156454608..8936c1308 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml
index 73fe04c21..837741dc5 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   service-a:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml
index c0388aabe..045479673 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   db:
     container_name: ${CONTAINER_NAME:-custom_container_name}
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml
index 3ec3280d5..dbd90d33a 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     environment:
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml
index ba01cfb8e..f93fea443 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml
index b9bbb72c5..61ddcfdae 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml
index 0a20be447..452316fe5 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml
index 11217bc13..d79e61e15 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14
diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose.yml
index 82aacb193..66c33e9d3 100644
--- a/packages/testcontainers/fixtures/docker-compose/docker-compose.yml
+++ b/packages/testcontainers/fixtures/docker-compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   container:
     image: cristianrgreco/testcontainer:1.1.14