diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 33fc24c6f1..407457e783 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1,26 +1,18 @@
-#
-# Copyright 2013-2024 Software Radio Systems Limited
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the distribution.
-#
-
-name: C/C++ CI
-on: push
-jobs:
-  x86_ubuntu_build:
-    name: Build on x86
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04, ubuntu-20.04]
-        compiler: [gcc, clang]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build srsRAN Project on x86 ${{ matrix.os }}
-      run: |
-        sudo apt update
-        sudo apt install -y cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-dev ninja-build
-        mkdir build && cd build && cmake -DENABLE_UHD=False -GNinja .. && ninja && ctest
\ No newline at end of file
+# name: C/C++ CI
+# on: push
+# jobs:
+#   x86_ubuntu_build:
+#     name: Build on x86
+#     runs-on: ${{ matrix.os }}
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         os: [ubuntu-22.04, ubuntu-20.04]
+#         compiler: [gcc, clang]
+#     steps:
+#     - uses: actions/checkout@v3
+#     - name: Build srsRAN Project on x86 ${{ matrix.os }}
+#       run: |
+#         sudo apt update
+#         sudo apt install -y cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-dev ninja-build
+#         mkdir build && cd build && cmake -DENABLE_UHD=False -GNinja .. && ninja && ctest
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..634a2e7256
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,51 @@
+name: Docker Build
+on:
+    pull_request:
+        branches: [main]
+
+jobs:
+    docker:
+      runs-on: ubuntu-latest
+      strategy:
+        matrix:
+          include:
+            - platform: linux/amd64
+              tag: amd64
+              <<: *uhd_params
+            - platform: linux/arm64
+              tag: arm64
+              <<: *dpdk_params
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+
+        -
+          name: Set up QEMU
+          uses: docker/setup-qemu-action@v3
+
+        -
+          name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
+
+        -
+          name: Build and push
+          uses: docker/build-push-action@v6
+          with:
+            push: false
+            tags: user/app:latest
+            file: ./docker/Dockerfile
+            # build-args: |
+            #     LIB=${LIB}
+            #     LIB_VERSION=${LIB_VERSION}
+            #     ARCH=${ARCH}
+            #     NUM_CORES=${KUBERNETES_CPU_LIMIT}
+            #     EXTRA_CMAKE_ARGS=\"${EXTRA_CMAKE_ARGS}
+
+
+.uhd_params: &uhd_params
+  LIB: uhd
+  LIB_VERSION: "4.6.0.0"
+
+.dpdk_params: &dpdk_params
+  LIB: dpdk
+  LIB_VERSION: "23.11"