diff --git a/ci-operator/config/openshift/lightspeed-operator/openshift-lightspeed-operator-main.yaml b/ci-operator/config/openshift/lightspeed-operator/openshift-lightspeed-operator-main.yaml
index e5a09b0876ec6..959beac8aaedc 100644
--- a/ci-operator/config/openshift/lightspeed-operator/openshift-lightspeed-operator-main.yaml
+++ b/ci-operator/config/openshift/lightspeed-operator/openshift-lightspeed-operator-main.yaml
@@ -2,7 +2,7 @@ base_images:
   golangci-lint:
     name: golangci-lint
     namespace: ci
-    tag: v1.64.8
+    tag: v2.3.1
   lightspeed-service-api:
     name: lightspeed-service-api
     namespace: ols
@@ -13,10 +13,7 @@ base_images:
     tag: operator-sdk
 binary_build_commands: make build --warn-undefined-variables
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.20
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile
   to: lightspeed-operator
diff --git a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-periodics.yaml b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-periodics.yaml
index cdea11bf6e06c..51bd7cbe34864 100644
--- a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-periodics.yaml
@@ -3,8 +3,6 @@ periodics:
   cluster: build02
   cron: 10 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: main
     org: openshift
@@ -70,8 +68,6 @@ periodics:
   cluster: build02
   cron: 10 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: main
     org: openshift
@@ -137,8 +133,6 @@ periodics:
   cluster: build02
   cron: 10 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: main
     org: openshift
@@ -204,8 +198,6 @@ periodics:
   cluster: build02
   cron: 10 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: main
     org: openshift
@@ -271,8 +263,6 @@ periodics:
   cluster: build02
   cron: 10 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: main
     org: openshift
diff --git a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-postsubmits.yaml
index fc62a54362b4c..75e674d982fb1 100644
--- a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-postsubmits.yaml
@@ -6,8 +6,6 @@ postsubmits:
     - ^main$
     cluster: build11
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
diff --git a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-presubmits.yaml
index a0fb3478c39c3..b254048205b0b 100644
--- a/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/lightspeed-operator/openshift-lightspeed-operator-main-presubmits.yaml
@@ -8,8 +8,6 @@ presubmits:
     cluster: build08
     context: ci/prow/bundle-e2e-4-20
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -78,8 +76,6 @@ presubmits:
     cluster: build08
     context: ci/prow/ci-index-lightspeed-bundle-test
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -133,8 +129,6 @@ presubmits:
     cluster: build08
     context: ci/prow/fips-image-scan-operator
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -196,8 +190,6 @@ presubmits:
     cluster: build08
     context: ci/prow/generate
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -252,8 +244,6 @@ presubmits:
     cluster: build08
     context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -308,8 +298,6 @@ presubmits:
     cluster: build08
     context: ci/prow/lint
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -364,8 +352,6 @@ presubmits:
     cluster: build08
     context: ci/prow/security
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -427,8 +413,6 @@ presubmits:
     cluster: build08
     context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"