diff --git a/.github/workflows/release-test-lihi.yaml b/.github/workflows/release-test-lihi.yaml
new file mode 100644
index 000000000..ad21dc5af
--- /dev/null
+++ b/.github/workflows/release-test-lihi.yaml
@@ -0,0 +1,87 @@
+---
+# This workflow is triggered whenever we release a new version of Starboard
+# by creating an annotated Git tag and pushing it to the upstream Git repository.
+#
+#    git tag -a v0.0.1 -m 'Release v0.0.1'
+#    git push upstream v0.0.1
+name: Release
+on:
+  push:
+    branches:
+      - lihitest-release-*
+env:
+  GO_VERSION: "1.23.1"
+  KIND_VERSION: "v0.11.1"
+  KIND_IMAGE: "kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
+jobs:
+  release:
+    name: Release-Test-Lihi
+    runs-on: ubuntu-20.04
+    env:
+      DOCKER_CLI_EXPERIMENTAL: "enabled"
+    steps:
+      - name: Cleanup Docker and KIND resources (Pre-Release)
+        run: |
+          docker system prune -a --force
+          docker volume prune --force
+      - name: Check disk usage (Pre-Release)
+        run: df -h
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@0e613a0980cbf65ed5b322eb7a1e075d28913a83
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR - Lihitest
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@62f4f872db3836360b72999f4b87f1ff13310f3a
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+#      - name: Login to docker.io registry
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USER }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Release
+        uses: goreleaser/goreleaser-action@v3
+        with:
+          version: v1.7.0
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+   #   - name: Update new version for plugin 'starboard' in krew-index
+   #     uses: rajatjindal/krew-release-bot@v0.0.43
+
+#      - name: Tag and push image to Amazon ECR
+#        id: build-image
+#        env:
+#          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+#          IMAGE_TAG: ${{ github.sha }}
+#        run: |
+#          # push to ECR
+#          docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_ECR
+#          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+#          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+      - name: Cleanup Docker and KIND resources
+        run: |
+          docker system prune -a --force
+          docker volume prune --force
+      - name: Check disk usage
+        run: df -h
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 523906802..e59477ffb 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -94,6 +94,7 @@ changelog:
 dockers:
   - image_templates:
       - "docker.io/aquasec/starboard:{{ .Version }}-amd64"
+      - "aquasec.azurecr.io/starboard:{{ .Version }}-amd64"
     use: buildx
     goos: linux
     dockerfile: build/starboard/Dockerfile
@@ -110,508 +111,7 @@ dockers:
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
       - "--platform=linux/amd64"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile
-    goarch: amd64
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-amd64"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.ubi8
-#    goarch: amd64
-#    ids:
-#      - starboard-operator
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/amd64"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.ubi9
-    goarch: amd64
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/scanner-aqua/Dockerfile
-    goarch: amd64
-    ids:
-      - starboard-scanner-aqua
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-scanner-aqua"
-      - "--label=org.opencontainers.image.description=Aqua scanner for Starboard"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-arm64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile
-    goarch: arm64
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/arm64"
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-arm64"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.ubi8
-#    goarch: arm64
-#    ids:
-#      - starboard-operator
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/arm64"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-arm64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.ubi9
-    goarch: arm64
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/arm64"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-s390x"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile
-    goarch: s390x
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/s390x"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ppc64le"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile
-    goarch: ppc64le
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/ppc64le"
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-s390x"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.ubi8
-#    goarch: s390x
-#    ids:
-#      - starboard-operator
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/s390x"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-s390x"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.ubi9
-    goarch: s390x
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/s390x"
-    extra_files:
-      - LICENSE
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-ppc64le"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.ubi8
-#    goarch: ppc64le
-#    ids:
-#      - starboard-operator
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/ppc64le"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-ppc64le"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.ubi9
-    goarch: ppc64le
-    ids:
-      - starboard-operator
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/ppc64le"
-    extra_files:
-      - LICENSE
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-fips-amd64"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.fips.ubi8
-#    goarch: amd64
-#    ids:
-#      - starboard-operator-fips
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/amd64"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
-    goarch: amd64
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-    extra_files:
-      - LICENSE
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-fips-arm64"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.fips.ubi8
-#    goarch: arm64
-#    ids:
-#      - starboard-operator-fips
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/arm64"
-#    extra_files:
-#      - LICENSE
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-fips-s390x"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.fips.ubi8
-#    goarch: s390x
-#    ids:
-#      - starboard-operator-fips
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/s390x"
-#    extra_files:
-#      - LICENSE
-#  - image_templates:
-#      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-fips-ppc64le"
-#    use: buildx
-#    goos: linux
-#    dockerfile: build/starboard-operator/Dockerfile.fips.ubi8
-#    goarch: ppc64le
-#    ids:
-#      - starboard-operator-fips
-#    build_flag_templates:
-#      - "--label=org.opencontainers.image.title=starboard-operator"
-#      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-#      - "--label=org.opencontainers.image.vendor=Aqua Security"
-#      - "--label=org.opencontainers.image.version={{ .Version }}"
-#      - "--label=org.opencontainers.image.created={{ .Date }}"
-#      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-#      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-#      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-#      - "--platform=linux/ppc64le"
-#    extra_files:
-#      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
-    goarch: amd64
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-arm64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
-    goarch: arm64
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/arm64"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-s390x"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
-    goarch: s390x
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/s390x"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-ppc64le"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
-    goarch: ppc64le
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/ppc64le"
-    extra_files:
-      - LICENSE
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-amd64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips
-    goarch: amd64
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/amd64"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-arm64"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips
-    goarch: arm64
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/arm64"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-s390x"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips
-    goarch: s390x
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/s390x"
-  - image_templates:
-      - "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-ppc64le"
-    use: buildx
-    goos: linux
-    dockerfile: build/starboard-operator/Dockerfile.fips
-    goarch: ppc64le
-    ids:
-      - starboard-operator-fips
-    build_flag_templates:
-      - "--label=org.opencontainers.image.title=starboard-operator"
-      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
-      - "--label=org.opencontainers.image.vendor=Aqua Security"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
-      - "--platform=linux/ppc64le"
+
 docker_manifests:
   - name_template: "aquasec/starboard:{{ .Version }}"
     image_templates:
@@ -619,39 +119,3 @@ docker_manifests:
   - name_template: "aquasec/starboard-operator:{{ .Version }}"
     image_templates:
       - "aquasec/starboard-operator:{{ .Version }}-amd64"
-      - "aquasec/starboard-operator:{{ .Version }}-arm64"
-      - "aquasec/starboard-operator:{{ .Version }}-s390x"
-      - "aquasec/starboard-operator:{{ .Version }}-ppc64le"
-  - name_template: "aquasec/starboard-operator:{{ .Version }}-fips"
-    image_templates:
-      - "aquasec/starboard-operator:{{ .Version }}-fips-amd64"
-      - "aquasec/starboard-operator:{{ .Version }}-fips-arm64"
-      - "aquasec/starboard-operator:{{ .Version }}-fips-s390x"
-      - "aquasec/starboard-operator:{{ .Version }}-fips-ppc64le"
-#  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi8"
-#    image_templates:
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-amd64"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-arm64"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-s390x"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-ppc64le"
-#  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi8-fips"
-#    image_templates:
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-fips-amd64"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-fips-arm64"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-fips-s390x"
-#      - "aquasec/starboard-operator:{{ .Version }}-ubi8-fips-ppc64le"
-  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi9"
-    image_templates:
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-amd64"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-arm64"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-s390x"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-ppc64le"
-  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi9-fips"
-    image_templates:
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-fips-arm64"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-fips-s390x"
-      - "aquasec/starboard-operator:{{ .Version }}-ubi9-fips-ppc64le"
-  - name_template: "aquasec/starboard-scanner-aqua:{{ .Version }}"
-    image_templates:
-      - "aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"