diff --git a/.github/workflows/build-alt.yaml b/.github/workflows/build-alt.yaml
deleted file mode 100644
index 979c561..0000000
--- a/.github/workflows/build-alt.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Docker build images on tag
-name: Build&Push Alt Images
-on:
-  push:
-    tags:
-      - '*'
-#          echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
-#          echo "Tag name from github.ref_name: ${{  github.ref_name }}"
-
-env:
-  IMAGE_TAGS: ${{  github.ref_name }}
-  REGISTRY_USER: clustersecret
-  IMAGE_REGISTRY: quay.io
-  IMAGE_NAMESPACE : clustersecret
-
-jobs:
-  build-push-quay:
-    name: Build&Push Alt
-    runs-on: ubuntu-20.04
-    # strategy:
-    #   fail-fast: false
-      # matrix:
-        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
-    steps:
-      # Checkout push-to-registry action github repository
-      - name: Checkout Push to Registry action
-        uses: actions/checkout@v2
-
-      # - name: Install latest podman
-      #   if: matrix.install_latest
-      #   run: |
-      #     bash .github/install_latest_podman.sh
-
-      - name: Install qemu dependency
-        # we need quemu-user-static for builds other archs with buildah
-        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y qemu-user-static
-
-      - name: Build alt Images
-        id: build_alt_image
-        uses: redhat-actions/buildah-build@main
-        with:
-          image: ${{ env.IMAGE_NAMESPACE }}
-          tags: alt-${{ env.IMAGE_TAGS }}
-          platforms: linux/s390x, linux/arm/v5, linux/arm/v7, linux/arm64/v8 #, linux/mips64le, linux/ppc64le, 
-          containerfiles: |
-            ./Dockerfile-others.gh
-
-      # Push the image manifest to Quay.io (Image Registry)
-      - name: Push To Quay
-        # uses: ./
-        id: push-to-quay
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build_alt_image.outputs.image }}
-          tags: ${{ steps.build_alt_image.outputs.tags }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Echo outputs
-        run: |
-          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
new file mode 100644
index 0000000..4daad7d
--- /dev/null
+++ b/.github/workflows/build-test.yaml
@@ -0,0 +1,206 @@
+# Docker build images on tag
+name: Test Builds Images
+on: [pull_request]
+
+env:
+  IMAGE_TAGS: ${{  github.ref_name }}
+  REGISTRY_USER: clustersecret
+  IMAGE_REGISTRY: quay.io
+  IMAGE_NAMESPACE : clustersecret
+
+jobs:
+  build-amd64:
+    name: Build amd64
+    runs-on: ubuntu-24.04
+    # strategy:
+    #   fail-fast: false
+      # matrix:
+        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
+    steps:
+      # Checkout push-to-registry action github repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v2
+
+      # - name: Install latest podman
+      #   if: matrix.install_latest
+      #   run: |
+      #     bash .github/install_latest_podman.sh
+
+      - name: Install qemu dependency
+        # we need quemu-user-static for builds other archs with buildah
+        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+
+      - name: Build amd64
+        id: build_image386
+        uses: redhat-actions/buildah-build@main
+        with:
+          image: ${{ env.IMAGE_NAMESPACE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          platforms: linux/amd64
+          containerfiles: |
+            ./Dockerfile.gh
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
+
+
+  build-386:
+    name: Build 386
+    runs-on: ubuntu-24.04
+    # strategy:
+    #   fail-fast: false
+      # matrix:
+        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
+    steps:
+      # Checkout push-to-registry action github repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v2
+
+      # - name: Install latest podman
+      #   if: matrix.install_latest
+      #   run: |
+      #     bash .github/install_latest_podman.sh
+
+      - name: Install qemu dependency
+        # we need quemu-user-static for builds other archs with buildah
+        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+
+      - name: Build alt Image 386
+        id: build_image386
+        uses: redhat-actions/buildah-build@main
+        with:
+          image: ${{ env.IMAGE_NAMESPACE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          platforms: linux/386
+          containerfiles: |
+            ./Dockerfile.gh
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
+
+
+  build-s390:
+    name: Builds 390
+    runs-on: ubuntu-24.04
+    # strategy:
+    #   fail-fast: false
+      # matrix:
+        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
+    steps:
+      # Checkout push-to-registry action github repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v2
+
+      # - name: Install latest podman
+      #   if: matrix.install_latest
+      #   run: |
+      #     bash .github/install_latest_podman.sh
+
+      - name: Install qemu dependency
+        # we need quemu-user-static for builds other archs with buildah
+        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          sudo apt-get install -y rustc
+
+      - name: Build alt Image s390
+        id: build_image390
+        uses: redhat-actions/buildah-build@main
+        with:
+          image: ${{ env.IMAGE_NAMESPACE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          platforms: linux/s390x
+          containerfiles: |
+            ./Dockerfile.gh
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
+
+
+  build-armv8:
+    name: Build armv8
+    runs-on: ubuntu-24.04
+    # strategy:
+    #   fail-fast: false
+      # matrix:
+        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
+    steps:
+      # Checkout push-to-registry action github repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v2
+
+      # - name: Install latest podman
+      #   if: matrix.install_latest
+      #   run: |
+      #     bash .github/install_latest_podman.sh
+
+      - name: Install qemu dependency
+        # we need quemu-user-static for builds other archs with buildah
+        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          sudo apt-get install -y rustc
+
+      - name: Build alt Image armv8
+        id: build_alt_imagev8
+        uses: redhat-actions/buildah-build@main
+        with:
+          image: ${{ env.IMAGE_NAMESPACE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          platforms: linux/arm64/v8
+          containerfiles: |
+            ./Dockerfile.gh
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
+
+  build-armv7:
+    name: Build armv7 #note it needs build essentials (uses docker-others)
+    runs-on: ubuntu-24.04
+    # strategy:
+    #   fail-fast: false
+      # matrix:
+        # install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
+    steps:
+      # Checkout push-to-registry action github repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v2
+
+      # - name: Install latest podman
+      #   if: matrix.install_latest
+      #   run: |
+      #     bash .github/install_latest_podman.sh
+
+      - name: Install qemu dependency
+        # we need quemu-user-static for builds other archs with buildah
+        # https://github.com/containers/podman/issues/13924#issuecomment-1103434554
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          sudo apt-get install -y rustc
+
+      - name: Build alt Image armv7
+        id: build_alt_imagev7
+        uses: redhat-actions/buildah-build@main
+        with:
+          image: ${{ env.IMAGE_NAMESPACE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          platforms: linux/arm/v7
+          containerfiles: |
+            ./Dockerfile-others.gh
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push-to-quay.outputs) }}"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 82b7c70..4088ab6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ env:
 jobs:
   build-push-quay:
     name: Build&Push
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     # strategy:
     #   fail-fast: false
       # matrix:
@@ -44,7 +44,7 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAMESPACE }}
           tags: ${{ env.IMAGE_TAGS }} latest
-          platforms: linux/386, linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64/v8
+          platforms: linux/386, linux/amd64, linux/s390x, linux/arm64/v8
           containerfiles: |
             ./Dockerfile.gh
 
diff --git a/.github/workflows/e2e-testing.yaml b/.github/workflows/e2e-testing.yaml
index d97ac6f..a0506c6 100644
--- a/.github/workflows/e2e-testing.yaml
+++ b/.github/workflows/e2e-testing.yaml
@@ -1,6 +1,6 @@
 name: E2E Testing
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   e2e-tests:
diff --git a/.github/workflows/py-unit-tests.yml b/.github/workflows/py-unit-tests.yml
index 661c498..4a1b896 100644
--- a/.github/workflows/py-unit-tests.yml
+++ b/.github/workflows/py-unit-tests.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10","3.11"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/src/requirements.txt b/src/requirements.txt
index 7ef4ecc..ddfd518 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,4 +1,4 @@
 kopf===1.37.2
 kubernetes===19.15.0
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
-pydantic==2.4.0
\ No newline at end of file
+pydantic==2.3.0
\ No newline at end of file