diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
index 42027c93a9..654669d182 100644
--- a/.github/workflows/pull_requests.yml
+++ b/.github/workflows/pull_requests.yml
@@ -5,6 +5,10 @@ on:
   pull_request:
     types: [synchronize, opened, reopened]
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -33,6 +37,16 @@ jobs:
       if: success()
       run: npx grunt prod
 
+    - name: Production Image Build
+      if: success()
+      id: build-image
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        containerfiles: ./Containerfile
+        platforms: linux/arm64, linux/amd64
+        oci: true
+
     - name: UI Tests
       if: success()
       run: |
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 8fbac9f32d..c5c4cf2e9c 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -72,8 +72,6 @@ jobs:
         containerfiles: ./Containerfile
         platforms: linux/arm64, linux/amd64
         oci: true
-        extra-args: |
-          --ulimit nofile=4096:4096
 
     - name: Upload Release Assets
       if: success()