diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
new file mode 100644
index 0000000..8d75442
--- /dev/null
+++ b/.github/workflows/container.yml
@@ -0,0 +1,36 @@
+name: Container build
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'container-images/**'
+      - '.github/workflows/container.yml'
+  pull_request:
+    paths:
+      - 'container-images/**'
+      - '.github/workflows/container.yml'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  container:
+    name: ${{ matrix.container }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        container:
+          - candlepin
+          - foreman
+          - foreman-proxy
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build ${{ matrix.container }} container
+        run: make -C container-images/${{ matrix.container }} build VERSION=ci
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f0d3ab7..065d7b3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,9 +7,11 @@ on:
       - master
     paths-ignore:
       - 'container-images/**'
+      - '.github/workflows/container.yml'
   pull_request:
     paths-ignore:
       - 'container-images/**'
+      - '.github/workflows/container.yml'
 
 
 concurrency: