diff --git a/Dockerfile b/Dockerfile
index e54f0c79b..c872524ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
 # Build the manager binary
-FROM docker.io/library/golang:1.22 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9 as builder
 ARG TARGETOS
 ARG TARGETARCH
 
-WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -26,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} GO111MODULE=on go
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 WORKDIR /
-COPY --from=builder /workspace/manager .
+COPY --from=builder /opt/app-root/src/manager .
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
index b6fd0997f..cebc7894f 100644
--- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -30,7 +30,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
-    createdAt: "2024-12-20T16:25:35Z"
+    createdAt: "2025-01-07T17:50:16Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml
index c0e18790f..1b76ea797 100644
--- a/bundle/tests/scorecard/config.yaml
+++ b/bundle/tests/scorecard/config.yaml
@@ -70,7 +70,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: operator-install
@@ -80,7 +80,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -90,7 +90,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -100,7 +100,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -110,7 +110,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -120,7 +120,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829
     labels:
       suite: cryostat
       test: cryostat-report
diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml
index 7ce049f0d..d67447ed2 100644
--- a/config/scorecard/patches/custom.config.yaml
+++ b/config/scorecard/patches/custom.config.yaml
@@ -8,7 +8,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: operator-install
@@ -18,7 +18,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -28,7 +28,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -38,7 +38,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -48,7 +48,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -58,7 +58,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250107174829"
     labels:
       suite: cryostat
       test: cryostat-report
diff --git a/internal/images/custom-scorecard-tests/Dockerfile b/internal/images/custom-scorecard-tests/Dockerfile
index 0f9110bc5..f1d4ed6f0 100644
--- a/internal/images/custom-scorecard-tests/Dockerfile
+++ b/internal/images/custom-scorecard-tests/Dockerfile
@@ -13,11 +13,10 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM docker.io/library/golang:1.22 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9 as builder
 ARG TARGETOS
 ARG TARGETARCH
 
-WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -42,7 +41,7 @@ ENV TEST=/usr/local/bin/cryostat-scorecard-tests \
 
 COPY internal/images/custom-scorecard-tests/bin/user_setup /usr/local/bin/
 COPY internal/images/custom-scorecard-tests/bin/entrypoint /usr/local/bin/
-COPY --from=builder /workspace/cryostat-scorecard-tests /usr/local/bin/
+COPY --from=builder /opt/app-root/src/cryostat-scorecard-tests /usr/local/bin/
 RUN  /usr/local/bin/user_setup
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]