diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml
index d88f034..6fab0d4 100644
--- a/.github/workflows/github-actions-demo.yml
+++ b/.github/workflows/github-actions-demo.yml
@@ -2,6 +2,29 @@ name: CI
 on: 
   - push
 jobs:
+  ubuntu_wget_opam:
+    strategy:
+      matrix:
+        opam_version:
+          - "2.1.6"
+          - "2.2.0"
+        ocaml_version:
+          - "4.14.2"
+          - "5.2.0"
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build image
+        uses: docker/build-push-action@v6
+        with:
+          context: "./ubuntu_wget_opam"
+          build-args: |
+            OPAM_VERSION=${{ matrix.opam_version }}
+            OCAML_VERSION=${{ matrix.ocaml_version }}
   alpine_wget_opam:
     strategy:
       matrix:
diff --git a/alpine_repos_opam/Dockerfile b/alpine_repos_opam/Dockerfile
index 0b0651e..a2fdf27 100644
--- a/alpine_repos_opam/Dockerfile
+++ b/alpine_repos_opam/Dockerfile
@@ -2,11 +2,11 @@ FROM alpine:3.20
 
 ARG OCAML_VERSION
 
-RUN apk add --no-cache gcc g++ make opam
+RUN apk add --no-cache alpine-sdk wget ca-certificates opam
 
 RUN set -eux; \
       opam init --no-setup --disable-sandboxing --compiler ocaml-base-compiler."$OCAML_VERSION";
 
 RUN set -eux; \
-      apk add --no-cache pkgconf bash ffmpeg-dev gmp-dev; \
+      apk add --no-cache bash ffmpeg-dev gmp-dev; \
       opam install --yes prometheus-app ffmpeg;
diff --git a/alpine_wget_opam/Dockerfile b/alpine_wget_opam/Dockerfile
index 2a01432..62d8c51 100644
--- a/alpine_wget_opam/Dockerfile
+++ b/alpine_wget_opam/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20
 ARG OPAM_VERSION
 ARG OCAML_VERSION
 
-RUN apk add --no-cache gcc g++ make patch wget ca-certificates
+RUN apk add --no-cache alpine-sdk wget ca-certificates
 
 RUN set -eux; \
       wget -O /usr/local/bin/opam --progress=dot:giga "https://github.com/ocaml/opam/releases/download/$OPAM_VERSION/opam-$OPAM_VERSION-x86_64-linux"; \
@@ -11,5 +11,5 @@ RUN set -eux; \
       opam init --no-setup --disable-sandboxing --compiler ocaml-base-compiler."$OCAML_VERSION";
 
 RUN set -eux; \
-      apk add --no-cache pkgconf bash ffmpeg-dev gmp-dev; \
+      apk add --no-cache bash ffmpeg-dev gmp-dev; \
       opam install --yes prometheus-app ffmpeg;
diff --git a/ubuntu_wget_opam/Dockerfile b/ubuntu_wget_opam/Dockerfile
new file mode 100644
index 0000000..27beec8
--- /dev/null
+++ b/ubuntu_wget_opam/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:24.04
+
+ARG OPAM_VERSION
+ARG OCAML_VERSION
+
+RUN set -eux; \
+      apt-get update; \
+      apt-get install gcc g++ make patch;
+
+RUN set -eux; \
+      wget -O /usr/local/bin/opam --progress=dot:giga "https://github.com/ocaml/opam/releases/download/$OPAM_VERSION/opam-$OPAM_VERSION-x86_64-linux"; \
+      chmod +x /usr/local/bin/opam; \
+      opam init --no-setup --disable-sandboxing --compiler ocaml-base-compiler."$OCAML_VERSION";
+
+RUN set -eux; \
+      opam install --yes prometheus-app ffmpeg;