diff --git a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml
index 2be2033dc3435..f0e703461f2e1 100644
--- a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml
+++ b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml
@@ -31,7 +31,7 @@ tests:
         requests:
           cpu: "3"
           memory: 250Mi
-    workflow: ipi-aws
+    workflow: codeready-toolchain-aws
 zz_generated_metadata:
   branch: master
   org: codeready-toolchain
diff --git a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml
index b8a123b3b7665..a446d5d0a080a 100644
--- a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml
+++ b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml
@@ -31,7 +31,7 @@ tests:
         requests:
           cpu: "3"
           memory: 250Mi
-    workflow: ipi-aws
+    workflow: codeready-toolchain-aws
 zz_generated_metadata:
   branch: master
   org: codeready-toolchain
diff --git a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml
index 19d36dbdc027d..21398fec6fd81 100644
--- a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml
+++ b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml
@@ -31,7 +31,7 @@ tests:
         requests:
           cpu: "3"
           memory: 250Mi
-    workflow: ipi-aws
+    workflow: codeready-toolchain-aws
 zz_generated_metadata:
   branch: master
   org: codeready-toolchain
diff --git a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml
index 20986b388e2a9..36dfe80a6da62 100644
--- a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml
+++ b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml
@@ -31,7 +31,7 @@ tests:
         requests:
           cpu: "3"
           memory: 250Mi
-    workflow: ipi-aws
+    workflow: codeready-toolchain-aws
 zz_generated_metadata:
   branch: master
   org: codeready-toolchain
diff --git a/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml b/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml
index f9b91ca488c66..349f354542441 100644
--- a/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml
+++ b/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml
@@ -51,7 +51,7 @@ tests:
         requests:
           cpu: "3"
           memory: 250Mi
-    workflow: ipi-aws
+    workflow: codeready-toolchain-aws
 zz_generated_metadata:
   branch: master
   org: codeready-toolchain
diff --git a/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS b/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS
index 24556ace54f7a..5d5a3c2517451 100644
--- a/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS
+++ b/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS
@@ -14,6 +14,7 @@ approvers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
 options: {}
 reviewers:
 - alexeykazakov
@@ -25,3 +26,4 @@ reviewers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
diff --git a/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS b/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS
index 4cafe820ef503..7fcea596f56e2 100644
--- a/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS
+++ b/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS
@@ -14,6 +14,7 @@ approvers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
 options: {}
 reviewers:
 - alexeykazakov
@@ -25,3 +26,4 @@ reviewers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
diff --git a/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS b/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS
index 90fc457c4cde2..2f1b1786726a8 100644
--- a/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS
+++ b/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS
@@ -14,6 +14,7 @@ approvers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
 options: {}
 reviewers:
 - alexeykazakov
@@ -25,3 +26,4 @@ reviewers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
diff --git a/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS b/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS
index 081a93cb77532..d5b0e203ec042 100644
--- a/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS
+++ b/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS
@@ -14,6 +14,7 @@ approvers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
 options: {}
 reviewers:
 - alexeykazakov
@@ -25,3 +26,4 @@ reviewers:
 - ranakan19
 - rsoaresd
 - xcoulon
+- jrosental
diff --git a/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS b/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS
index aae04331b1b8c..f445615e0c14f 100644
--- a/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS
+++ b/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS
@@ -14,7 +14,7 @@ approvers:
 - fbm3307
 - metlos
 - rsoaresd
-
+- jrosental
 options: {}
 reviewers:
 - alexeykazakov
@@ -25,4 +25,5 @@ reviewers:
 - xcoulon
 - fbm3307
 - metlos
-- rsoaresd
\ No newline at end of file
+- rsoaresd
+- jrosental
\ No newline at end of file
diff --git a/ci-operator/step-registry/codeready-toolchain/OWNERS b/ci-operator/step-registry/codeready-toolchain/OWNERS
new file mode 100644
index 0000000000000..a8003660698e1
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/OWNERS
@@ -0,0 +1,23 @@
+approvers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
+options: {}
+reviewers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
diff --git a/ci-operator/step-registry/codeready-toolchain/aws/OWNERS b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS
new file mode 100644
index 0000000000000..a8003660698e1
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS
@@ -0,0 +1,23 @@
+approvers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
+options: {}
+reviewers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json
new file mode 100644
index 0000000000000..6ac59d417615a
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json
@@ -0,0 +1,29 @@
+{
+	"path": "codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"alexeykazakov",
+			"fbm3307",
+			"matousjobanek",
+			"metlos",
+			"mfrancisc",
+			"rajivnathan",
+			"ranakan19",
+			"rsoaresd",
+			"xcoulon",
+			"jrosental"
+		],
+		"reviewers": [
+			"alexeykazakov",
+			"fbm3307",
+			"matousjobanek",
+			"metlos",
+			"mfrancisc",
+			"rajivnathan",
+			"ranakan19",
+			"rsoaresd",
+			"xcoulon",
+			"jrosental"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml
new file mode 100644
index 0000000000000..44094928c1f5b
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml
@@ -0,0 +1,13 @@
+workflow:
+  as: codeready-toolchain-aws
+  steps:
+    allow_best_effort_post_steps: true
+    pre:
+    - chain: ipi-aws-pre
+    post:
+    - ref: codeready-toolchain-gather
+      optional_on_success: true
+    - chain: ipi-aws-post
+  documentation: |-
+    This workflow provides is based on /ci-operator/step-registry/ipi/aws/ipi-aws-workflow.yaml.
+    Additionally, it adds codeready-toolchain-gather which will save the Custom Resources on ARTIFACT dir.
\ No newline at end of file
diff --git a/ci-operator/step-registry/codeready-toolchain/gather/OWNERS b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS
new file mode 100644
index 0000000000000..a8003660698e1
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS
@@ -0,0 +1,23 @@
+approvers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
+options: {}
+reviewers:
+- alexeykazakov
+- fbm3307
+- matousjobanek
+- metlos
+- mfrancisc
+- rajivnathan
+- ranakan19
+- rsoaresd
+- xcoulon
+- jrosental
diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh
new file mode 100755
index 0000000000000..eec3f23918ca4
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# queue function stolen from https://steps.ci.openshift.org/reference/gather-extra ;-)
+function queue() {
+  local TARGET="${1}"
+  shift
+  local LIVE
+  LIVE="$(jobs | wc -l)"
+  while [[ "${LIVE}" -ge 45 ]]; do
+    sleep 1
+    LIVE="$(jobs | wc -l)"
+  done
+  echo "${@}"
+  if [[ -n "${FILTER:-}" ]]; then
+    "${@}" | "${FILTER}" >"${TARGET}" &
+  else
+    "${@}" >"${TARGET}" &
+  fi
+}
+
+# Resources
+CRD_LIST=$(oc get crds -o jsonpath='{.items[?(@.spec.group=="toolchain.dev.openshift.com")].metadata.name}')
+for CRD in ${CRD_LIST}; do
+  queue ${ARTIFACT_DIR}/${CRD}.json oc --insecure-skip-tls-verify --request-timeout=5s get ${CRD} --all-namespaces -o json
+done
\ No newline at end of file
diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json
new file mode 100644
index 0000000000000..ddc4f9d818ee6
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json
@@ -0,0 +1,29 @@
+{
+	"path": "codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml",
+	"owners": {
+		"approvers": [
+			"alexeykazakov",
+			"fbm3307",
+			"matousjobanek",
+			"metlos",
+			"mfrancisc",
+			"rajivnathan",
+			"ranakan19",
+			"rsoaresd",
+			"xcoulon",
+			"jrosental"
+		],
+		"reviewers": [
+			"alexeykazakov",
+			"fbm3307",
+			"matousjobanek",
+			"metlos",
+			"mfrancisc",
+			"rajivnathan",
+			"ranakan19",
+			"rsoaresd",
+			"xcoulon",
+			"jrosental"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml
new file mode 100644
index 0000000000000..954af452b89ea
--- /dev/null
+++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml
@@ -0,0 +1,14 @@
+ref:
+  as: codeready-toolchain-gather
+  best_effort: true
+  optional_on_success: true
+  from: cli
+  commands: codeready-toolchain-gather-commands.sh
+  timeout: 900s
+  grace_period: 60s
+  resources:
+    requests:
+      cpu: 300m
+      memory: 300Mi
+  documentation: |-
+    The pre-deprovision artifacts step collects codeready-toolchain artifacts which are either not covered by must-gather or gather-extra.