diff --git a/_topic_map.yml b/_topic_map.yml
index ee338d11321f..4cea9904a4ba 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -102,11 +102,6 @@ Topics:
 - Name: Red Hat Enterprise Linux CoreOS
   File: architecture-rhcos
   Distros: openshift-enterprise,openshift-webscale
-- Name: The CI/CD methodology and practice
-  File: cicd_gitops
-  Distros: openshift-enterprise,openshift-webscale
-- Name: Using ArgoCD
-  File: argocd
 - Name: Admission plug-ins
   File: admission-plug-ins
   Distros: openshift-enterprise,openshift-webscale,openshift-aro
@@ -1194,64 +1189,77 @@ Topics:
 - Name: Red Hat Operators reference
   File: operator-reference
 ---
-Name: Builds
-Dir: builds
+Name: CI/CD
+Dir: cicd
 Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
 Topics:
-- Name: Understanding image builds
-  File: understanding-image-builds
-- Name: Understanding build configurations
-  File: understanding-buildconfigs
-- Name: Creating build inputs
-  File: creating-build-inputs
-- Name: Managing build output
-  File: managing-build-output
-- Name: Using build strategies
-  File: build-strategies
-- Name: Custom image builds with Buildah
-  File: custom-builds-buildah
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Performing basic builds
-  File: basic-build-operations
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
-- Name: Triggering and modifying builds
-  File: triggering-builds-build-hooks
+- Name: Builds
+  Dir: builds
   Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
-- Name: Performing advanced builds
-  File: advanced-build-operations
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Using Red Hat subscriptions in builds
-  File: running-entitled-builds
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Securing builds by strategy
-  File: securing-builds-by-strategy
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Build configuration resources
-  File: build-configuration
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Troubleshooting builds
-  File: troubleshooting-builds
+  Topics:
+  - Name: Understanding image builds
+    File: understanding-image-builds
+  - Name: Understanding build configurations
+    File: understanding-buildconfigs
+  - Name: Creating build inputs
+    File: creating-build-inputs
+  - Name: Managing build output
+    File: managing-build-output
+  - Name: Using build strategies
+    File: build-strategies
+  - Name: Custom image builds with Buildah
+    File: custom-builds-buildah
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Performing basic builds
+    File: basic-build-operations
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
+  - Name: Triggering and modifying builds
+    File: triggering-builds-build-hooks
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
+  - Name: Performing advanced builds
+    File: advanced-build-operations
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Using Red Hat subscriptions in builds
+    File: running-entitled-builds
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Securing builds by strategy
+    File: securing-builds-by-strategy
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Build configuration resources
+    File: build-configuration
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Troubleshooting builds
+    File: troubleshooting-builds
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin
+  - Name: Setting up additional trusted certificate authorities for builds
+    File: setting-up-trusted-ca
+    Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
+- Name: Pipelines
+  Dir: pipelines
   Distros: openshift-enterprise,openshift-webscale,openshift-origin
-- Name: Setting up additional trusted certificate authorities for builds
-  File: setting-up-trusted-ca
-  Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
----
-Name: Pipelines
-Dir: pipelines
-Distros: openshift-enterprise,openshift-webscale,openshift-origin
-Topics:
-- Name: Understanding OpenShift Pipelines
-  File: understanding-openshift-pipelines
-- Name: Installing OpenShift Pipelines
-  File: installing-pipelines
-- Name: Uninstalling OpenShift Pipelines
-  File: uninstalling-pipelines
-- Name: Creating CI/CD solutions for applications using OpenShift Pipelines
-  File: creating-applications-with-cicd-pipelines
-- Name: Working with Pipelines using the Developer perspective
-  File: working-with-pipelines-using-the-developer-perspective
-- Name: OpenShift Pipelines release notes
-  File: op-release-notes
+  Topics:
+  - Name: Understanding OpenShift Pipelines
+    File: understanding-openshift-pipelines
+  - Name: Installing OpenShift Pipelines
+    File: installing-pipelines
+  - Name: Uninstalling OpenShift Pipelines
+    File: uninstalling-pipelines
+  - Name: Creating CI/CD solutions for applications using OpenShift Pipelines
+    File: creating-applications-with-cicd-pipelines
+  - Name: Working with Pipelines using the Developer perspective
+    File: working-with-pipelines-using-the-developer-perspective
+  - Name: OpenShift Pipelines release notes
+    File: op-release-notes
+#- Name: GitOps
+#  Dir: gitops
+#  Distros: openshift-enterprise,openshift-webscale,openshift-origin
+#  Topics:
+#  - Name: Understanding OpenShift GitOps
+#    File: understanding-openshift-gitops
+#  - Name: Installing OpenShift GitOps Operator
+#    File: installing-openshift-gitops-operator
+#  - Name: Getting started with OpenShift GitOps
+#    File: getting-satrted-with-openshift-gitops
 ---
 Name: Images
 Dir: openshift_images
diff --git a/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc b/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
index 2c1b05e5ffab..99619b3b69c7 100644
--- a/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
+++ b/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
@@ -17,7 +17,7 @@ The *Developer* perspective in the web console provides you the following option
 * *Helm Chart*: Explore the *Developer Catalog* to select the required Helm chart to simplify deployment of applications and services.
 
 ifdef::openshift-enterprise,openshift-webscale[]
-Note that certain options, such as *Pipelines*, *Event Source*, and *Import Virtual Machines*, are displayed only when the xref:../../pipelines/installing-pipelines.adoc#op-installing-pipelines-operator-in-web-console_installing-pipelines[OpenShift Pipelines], xref:../../serverless/installing_serverless/installing-openshift-serverless.adoc#serverless-install-web-console_installing-openshift-serverless[OpenShift Serverless], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization] Operators are installed, respectively.
+Note that certain options, such as *Pipelines*, *Event Source*, and *Import Virtual Machines*, are displayed only when the xref:../../cicd/pipelines/installing-pipelines.adoc#op-installing-pipelines-operator-in-web-console_installing-pipelines[OpenShift Pipelines], xref:../../serverless/installing_serverless/installing-openshift-serverless.adoc#serverless-install-web-console_installing-openshift-serverless[OpenShift Serverless], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization] Operators are installed, respectively.
 endif::[]
 
 == Prerequisites
diff --git a/applications/pruning-objects.adoc b/applications/pruning-objects.adoc
index db0f90405122..9dcff7f00133 100644
--- a/applications/pruning-objects.adoc
+++ b/applications/pruning-objects.adoc
@@ -19,7 +19,7 @@ include::modules/pruning-groups.adoc[leveloffset=+1]
 include::modules/pruning-deployments.adoc[leveloffset=+1]
 include::modules/pruning-builds.adoc[leveloffset=+1]
 .Additional resources
-- xref:../builds/advanced-build-operations.adoc#builds-build-pruning-advanced-build-operations[Performing advanced builds -> Pruning builds]
+- xref:../cicd/builds/advanced-build-operations.adoc#builds-build-pruning-advanced-build-operations[Performing advanced builds -> Pruning builds]
 
 include::modules/pruning-images.adoc[leveloffset=+1]
 include::modules/pruning-images-manual.adoc[leveloffset=+1]
diff --git a/architecture/architecture.adoc b/architecture/architecture.adoc
index a7264a400e2a..7aa286bfa948 100644
--- a/architecture/architecture.adoc
+++ b/architecture/architecture.adoc
@@ -15,7 +15,7 @@ include::modules/architecture-platform-benefits.adoc[leveloffset=+2]
 == User facing components
 * Workloads (Deployments, Jobs, ReplicaSets, etc)
 * Operator Lifecycle Manager
-* xref:../builds/understanding-image-builds.adoc[Builds] - The build component
+* xref:../cicd/builds/understanding-image-builds.adoc[Builds] - The build component
 provides an API and infrastructure for producing new container images using a
 variety of techniques including industry standard Dockerfiles and publishing
 them to either the cluster image registry, or an external registry. It also
diff --git a/architecture/understanding-development.adoc b/architecture/understanding-development.adoc
index ff5a94d2036d..d5faca7bda86 100644
--- a/architecture/understanding-development.adoc
+++ b/architecture/understanding-development.adoc
@@ -103,7 +103,7 @@ to push and pull images.
 ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
 For more details on the process of building container images, pushing them to
 registries, and running them, see
-xref:../builds/custom-builds-buildah.adoc#custom-builds-buildah[Custom image builds with Buildah].
+xref:../cicd/builds/custom-builds-buildah.adoc#custom-builds-buildah[Custom image builds with Buildah].
 endif::openshift-origin,openshift-enterprise,openshift-webscale[]
 
 [id="container-build-tool-options"]
diff --git a/builds/images b/builds/images
deleted file mode 120000
index 5e67573196d8..000000000000
--- a/builds/images
+++ /dev/null
@@ -1 +0,0 @@
-../images
\ No newline at end of file
diff --git a/builds/modules b/builds/modules
deleted file mode 120000
index 464b823aca16..000000000000
--- a/builds/modules
+++ /dev/null
@@ -1 +0,0 @@
-../modules
\ No newline at end of file
diff --git a/builds/advanced-build-operations.adoc b/cicd/builds/advanced-build-operations.adoc
similarity index 100%
rename from builds/advanced-build-operations.adoc
rename to cicd/builds/advanced-build-operations.adoc
diff --git a/builds/basic-build-operations.adoc b/cicd/builds/basic-build-operations.adoc
similarity index 100%
rename from builds/basic-build-operations.adoc
rename to cicd/builds/basic-build-operations.adoc
diff --git a/builds/build-configuration.adoc b/cicd/builds/build-configuration.adoc
similarity index 100%
rename from builds/build-configuration.adoc
rename to cicd/builds/build-configuration.adoc
diff --git a/builds/build-strategies.adoc b/cicd/builds/build-strategies.adoc
similarity index 100%
rename from builds/build-strategies.adoc
rename to cicd/builds/build-strategies.adoc
diff --git a/builds/creating-build-inputs.adoc b/cicd/builds/creating-build-inputs.adoc
similarity index 100%
rename from builds/creating-build-inputs.adoc
rename to cicd/builds/creating-build-inputs.adoc
diff --git a/builds/custom-builds-buildah.adoc b/cicd/builds/custom-builds-buildah.adoc
similarity index 90%
rename from builds/custom-builds-buildah.adoc
rename to cicd/builds/custom-builds-buildah.adoc
index 64b55c69da4d..29815a2a1cf4 100644
--- a/builds/custom-builds-buildah.adoc
+++ b/cicd/builds/custom-builds-buildah.adoc
@@ -26,7 +26,7 @@ trusted with administrative privileges on the cluster.
 
 == Prerequisites
 
-* Review how to xref:../builds/securing-builds-by-strategy.adoc#securing-builds-by-strategy[grant custom build permissions].
+* Review how to xref:../../cicd/builds/securing-builds-by-strategy.adoc#securing-builds-by-strategy[grant custom build permissions].
 
 
 include::modules/builds-create-custom-build-artifacts.adoc[leveloffset=+1]
diff --git a/cicd/builds/images b/cicd/builds/images
new file mode 120000
index 000000000000..5fa6987088da
--- /dev/null
+++ b/cicd/builds/images
@@ -0,0 +1 @@
+../../images
\ No newline at end of file
diff --git a/builds/managing-build-output.adoc b/cicd/builds/managing-build-output.adoc
similarity index 100%
rename from builds/managing-build-output.adoc
rename to cicd/builds/managing-build-output.adoc
diff --git a/cicd/builds/modules b/cicd/builds/modules
new file mode 120000
index 000000000000..8b0e8540076d
--- /dev/null
+++ b/cicd/builds/modules
@@ -0,0 +1 @@
+../../modules
\ No newline at end of file
diff --git a/builds/running-entitled-builds.adoc b/cicd/builds/running-entitled-builds.adoc
similarity index 88%
rename from builds/running-entitled-builds.adoc
rename to cicd/builds/running-entitled-builds.adoc
index 65c29818957d..bc289f1876c9 100644
--- a/builds/running-entitled-builds.adoc
+++ b/cicd/builds/running-entitled-builds.adoc
@@ -25,5 +25,5 @@ include::modules/builds-strategy-docker-squash-layers.adoc[leveloffset=+1]
 
 == Additional resources
 
-* See xref:../openshift_images/image-streams-manage.adoc#image-streams-managing[Managing image streams]
+* See xref:../../openshift_images/image-streams-manage.adoc#image-streams-managing[Managing image streams]
 for more information.
diff --git a/builds/securing-builds-by-strategy.adoc b/cicd/builds/securing-builds-by-strategy.adoc
similarity index 100%
rename from builds/securing-builds-by-strategy.adoc
rename to cicd/builds/securing-builds-by-strategy.adoc
diff --git a/builds/setting-up-trusted-ca.adoc b/cicd/builds/setting-up-trusted-ca.adoc
similarity index 95%
rename from builds/setting-up-trusted-ca.adoc
rename to cicd/builds/setting-up-trusted-ca.adoc
index 879ed2369c08..61dd74616e38 100644
--- a/builds/setting-up-trusted-ca.adoc
+++ b/cicd/builds/setting-up-trusted-ca.adoc
@@ -21,7 +21,7 @@ include::modules/configmap-adding-ca.adoc[leveloffset=+1]
 
 * link:https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-a-configmap[Create a `ConfigMap`]
 * link:https://kubectl.docs.kubernetes.io/guides/config_management/secrets_configmaps/[Secrets and `ConfigMaps`]
-* xref:../networking/configuring-a-custom-pki.adoc#configuring-a-custom-pki[Configuring a custom PKI]
+* xref:../../networking/configuring-a-custom-pki.adoc#configuring-a-custom-pki[Configuring a custom PKI]
 endif::[]
 
 
diff --git a/builds/triggering-builds-build-hooks.adoc b/cicd/builds/triggering-builds-build-hooks.adoc
similarity index 100%
rename from builds/triggering-builds-build-hooks.adoc
rename to cicd/builds/triggering-builds-build-hooks.adoc
diff --git a/builds/troubleshooting-builds.adoc b/cicd/builds/troubleshooting-builds.adoc
similarity index 100%
rename from builds/troubleshooting-builds.adoc
rename to cicd/builds/troubleshooting-builds.adoc
diff --git a/builds/understanding-buildconfigs.adoc b/cicd/builds/understanding-buildconfigs.adoc
similarity index 100%
rename from builds/understanding-buildconfigs.adoc
rename to cicd/builds/understanding-buildconfigs.adoc
diff --git a/builds/understanding-image-builds.adoc b/cicd/builds/understanding-image-builds.adoc
similarity index 100%
rename from builds/understanding-image-builds.adoc
rename to cicd/builds/understanding-image-builds.adoc
diff --git a/cicd/gitops/images b/cicd/gitops/images
new file mode 120000
index 000000000000..5fa6987088da
--- /dev/null
+++ b/cicd/gitops/images
@@ -0,0 +1 @@
+../../images
\ No newline at end of file
diff --git a/cicd/gitops/modules b/cicd/gitops/modules
new file mode 120000
index 000000000000..8b0e8540076d
--- /dev/null
+++ b/cicd/gitops/modules
@@ -0,0 +1 @@
+../../modules
\ No newline at end of file
diff --git a/pipelines/creating-applications-with-cicd-pipelines.adoc b/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
similarity index 80%
rename from pipelines/creating-applications-with-cicd-pipelines.adoc
rename to cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
index 2b0c25626bb4..26e9d8253e69 100644
--- a/pipelines/creating-applications-with-cicd-pipelines.adoc
+++ b/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
@@ -26,8 +26,8 @@ This section uses the `pipelines-tutorial` example to demonstrate the preceding
 == Prerequisites
 
 * You have access to an {product-title} cluster.
-* You have installed xref:../pipelines/installing-pipelines.adoc#installing-pipelines[OpenShift Pipelines] using the {pipelines-title} Operator listed in the OpenShift OperatorHub. Once installed, it is applicable to the entire cluster.
-* You have installed xref:../cli_reference/tkn_cli/installing-tkn.adoc#installing-tkn[OpenShift Pipelines CLI].
+* You have installed xref:../../cicd/pipelines/installing-pipelines.adoc#installing-pipelines[OpenShift Pipelines] using the {pipelines-title} Operator listed in the OpenShift OperatorHub. Once installed, it is applicable to the entire cluster.
+* You have installed xref:../../cli_reference/tkn_cli/installing-tkn.adoc#installing-tkn[OpenShift Pipelines CLI].
 * You have forked the front-end link:https://github.com/openshift-pipelines/vote-ui/tree/release-tech-preview-2[`ui-repo`] and back-end link:https://github.com/openshift-pipelines/vote-api/tree/release-tech-preview-2[`api-repo`] Git repositories using your GitHub ID, and have Administrator access to these repositories.
 * Optional: You have cloned the link:https://github.com/openshift/pipelines-tutorial/tree/release-tech-preview-2[`pipelines-tutorial`] Git repository.
 
@@ -49,6 +49,6 @@ include::modules/op-triggering-a-pipelinerun.adoc[leveloffset=+1]
 [id="pipeline-addtl-resources"]
 == Additional resources
 
-* For more details on pipelines in the *Developer* perspective, see the xref:../pipelines/working-with-pipelines-using-the-developer-perspective.adoc#working-with-pipelines-using-the-developer-perspective[working with Pipelines in the *Developer* perspective] section.
-* To learn more about Security Context Constraints (SCCs), see the xref:../authentication/managing-security-context-constraints.adoc#managing-pod-security-policies[Managing Security Context Constraints] section.
+* For more details on pipelines in the *Developer* perspective, see the xref:../../cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc#working-with-pipelines-using-the-developer-perspective[working with Pipelines in the *Developer* perspective] section.
+* To learn more about Security Context Constraints (SCCs), see the xref:../../authentication/managing-security-context-constraints.adoc#managing-pod-security-policies[Managing Security Context Constraints] section.
 * For more examples of reusable tasks, see the link:https://github.com/openshift/pipelines-catalog[OpenShift Catalog] repository. Additionally, you can also see the Tekton Catalog in the Tekton project.
diff --git a/cicd/pipelines/images b/cicd/pipelines/images
new file mode 120000
index 000000000000..5fa6987088da
--- /dev/null
+++ b/cicd/pipelines/images
@@ -0,0 +1 @@
+../../images
\ No newline at end of file
diff --git a/pipelines/installing-pipelines.adoc b/cicd/pipelines/installing-pipelines.adoc
similarity index 57%
rename from pipelines/installing-pipelines.adoc
rename to cicd/pipelines/installing-pipelines.adoc
index 2ce2a3e2770c..b400164c4077 100644
--- a/pipelines/installing-pipelines.adoc
+++ b/cicd/pipelines/installing-pipelines.adoc
@@ -10,7 +10,7 @@ This guide walks cluster administrators through the process of installing the {p
 
 [NOTE]
 ====
-The {pipelines-title} Operator is supported for installation in a restricted network environment. For more information, see xref:../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks].
+The {pipelines-title} Operator is supported for installation in a restricted network environment. For more information, see xref:../../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks].
 ====
 
 // Prerequisites for installing OpenShift Operator
@@ -20,12 +20,12 @@ The {pipelines-title} Operator is supported for installation in a restricted net
 * You have access to an {product-title} cluster using an account with `cluster-admin` permissions.
 
 * You have installed `oc` CLI.
-* You have installed xref:../cli_reference/tkn_cli/installing-tkn.adoc#installing-tkn[OpenShift Pipelines (`tkn`) CLI] on your local system.
+* You have installed xref:../../cli_reference/tkn_cli/installing-tkn.adoc#installing-tkn[OpenShift Pipelines (`tkn`) CLI] on your local system.
 
 ifdef::openshift-origin[]
-* Ensure that you have downloaded the link:https://cloud.redhat.com/openshift/install/pull-secret[pull secret from the Red Hat OpenShift Cluster Manager site] as shown in the xref:../installing/installing_gcp/installing-gcp-customizations.adoc#installation-obtaining-installer_installing-gcp-customizations[Obtaining the installation program] to install this Operator.
+* Ensure that you have downloaded the link:https://cloud.redhat.com/openshift/install/pull-secret[pull secret from the Red Hat OpenShift Cluster Manager site] as shown in the xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installation-obtaining-installer_installing-gcp-customizations[Obtaining the installation program] to install this Operator.
 +
-If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in xref:../post_installation_configuration/preparing-for-users.adoc#olm-installing-operators-from-operatorhub-configure_post-install-preparing-for-users[Configuring {product-title} to use Red Hat Operators].
+If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in xref:../../post_installation_configuration/preparing-for-users.adoc#olm-installing-operators-from-operatorhub-configure_post-install-preparing-for-users[Configuring {product-title} to use Red Hat Operators].
 endif::[]
 
 
@@ -40,4 +40,4 @@ include::modules/op-installing-pipelines-operator-using-the-cli.adoc[leveloffset
 
 .Additional Resources
 
-* You can learn more about installing Operators on {product-title} in the xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[adding Operators to a cluster] section.
+* You can learn more about installing Operators on {product-title} in the xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[adding Operators to a cluster] section.
diff --git a/cicd/pipelines/modules b/cicd/pipelines/modules
new file mode 120000
index 000000000000..8b0e8540076d
--- /dev/null
+++ b/cicd/pipelines/modules
@@ -0,0 +1 @@
+../../modules
\ No newline at end of file
diff --git a/pipelines/op-release-notes.adoc b/cicd/pipelines/op-release-notes.adoc
similarity index 76%
rename from pipelines/op-release-notes.adoc
rename to cicd/pipelines/op-release-notes.adoc
index 844657b8054f..5530652934f5 100644
--- a/pipelines/op-release-notes.adoc
+++ b/cicd/pipelines/op-release-notes.adoc
@@ -16,7 +16,7 @@ toc::[]
 * Powerful CLI for interacting with pipelines.
 * Integrated user experience with the Developer perspective of the {product-title} web console.
 
-For an overview of {pipelines-title}, see xref:../pipelines/understanding-openshift-pipelines.adoc#understanding-openshift-pipelines[Understanding OpenShift Pipelines].
+For an overview of {pipelines-title}, see xref:../../cicd/pipelines/understanding-openshift-pipelines.adoc#understanding-openshift-pipelines[Understanding OpenShift Pipelines].
 
 [id="getting-support"]
 == Getting support
@@ -32,10 +32,3 @@ include::modules/op-release-notes-1-2.adoc[leveloffset=+1]
 include::modules/op-release-notes-1-1.adoc[leveloffset=+1]
 
 include::modules/op-release-notes-1-0.adoc[leveloffset=+1]
-
-////
-[id="additional-resources"]
-.Additional resources
-
-* For more information on uninstalling the {pipelines-title} Operator, see the xref:../pipelines/uninstalling-pipelines.adoc#uninstalling-pipelines[uninstalling OpenShift Pipelines] section.
-////
diff --git a/pipelines/understanding-openshift-pipelines.adoc b/cicd/pipelines/understanding-openshift-pipelines.adoc
similarity index 89%
rename from pipelines/understanding-openshift-pipelines.adoc
rename to cicd/pipelines/understanding-openshift-pipelines.adoc
index 2363e26d7ebf..c3d7cc4b3f88 100644
--- a/pipelines/understanding-openshift-pipelines.adoc
+++ b/cicd/pipelines/understanding-openshift-pipelines.adoc
@@ -45,5 +45,5 @@ include::modules/op-about-triggers.adoc[leveloffset=+2]
 
 == Additional resources
 
-* For information on installing Pipelines, see xref:../pipelines/installing-pipelines.adoc#installing-pipelines[Installing OpenShift Pipelines].
-* For more details on creating custom CI/CD solutions, see xref:../pipelines/creating-applications-with-cicd-pipelines.adoc#creating-applications-with-cicd-pipelines[Creating applications with CI/CD Pipelines].
+* For information on installing Pipelines, see xref:../../cicd/pipelines/installing-pipelines.adoc#installing-pipelines[Installing OpenShift Pipelines].
+* For more details on creating custom CI/CD solutions, see xref:../../cicd/pipelines/creating-applications-with-cicd-pipelines.adoc#creating-applications-with-cicd-pipelines[Creating applications with CI/CD Pipelines].
diff --git a/pipelines/uninstalling-pipelines.adoc b/cicd/pipelines/uninstalling-pipelines.adoc
similarity index 83%
rename from pipelines/uninstalling-pipelines.adoc
rename to cicd/pipelines/uninstalling-pipelines.adoc
index 5db20d4ec133..2139e8292335 100644
--- a/pipelines/uninstalling-pipelines.adoc
+++ b/cicd/pipelines/uninstalling-pipelines.adoc
@@ -19,4 +19,4 @@ include::modules/op-uninstalling-the-pipelines-operator.adoc[leveloffset=+1]
 
 .Additional Resources
 
-* You can learn more about uninstalling Operators on {product-title} in the xref:../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[deleting Operators from a cluster] section.
+* You can learn more about uninstalling Operators on {product-title} in the xref:../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[deleting Operators from a cluster] section.
diff --git a/pipelines/working-with-pipelines-using-the-developer-perspective.adoc b/cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
similarity index 77%
rename from pipelines/working-with-pipelines-using-the-developer-perspective.adoc
rename to cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
index 0cf8dbf9b700..6e0227d17eb9 100644
--- a/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
+++ b/cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
@@ -20,8 +20,8 @@ After you create the Pipelines for your application, you can view and visually i
 [discrete]
 == Prerequisites
 
-* You have access to an {product-title} cluster and have switched to the xref:../web_console/odc-about-developer-perspective.adoc[Developer perspective] in the web console.
-* You have the xref:../pipelines/installing-pipelines.adoc#installing-pipelines[OpenShift Pipelines Operator installed] in your cluster.
+* You have access to an {product-title} cluster and have switched to the xref:../../web_console/odc-about-developer-perspective.adoc[Developer perspective] in the web console.
+* You have the xref:../../cicd/pipelines/installing-pipelines.adoc#installing-pipelines[OpenShift Pipelines Operator installed] in your cluster.
 * You are a cluster administrator or a user with create and edit permissions.
 * You have created a project.
 
@@ -30,7 +30,7 @@ include::modules/op-constructing-pipelines-using-pipeline-builder.adoc[leveloffs
 
 == Creating applications with OpenShift Pipelines
 
-To create Pipelines along with applications, use the *From Git* option in the *Add* view of the *Developer* perspective. For more information, see xref:../applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc#odc-importing-codebase-from-git-to-create-application_odc-creating-applications-using-developer-perspective[Creating applications using the Developer perspective].
+To create Pipelines along with applications, use the *From Git* option in the *Add* view of the *Developer* perspective. For more information, see xref:../../applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc#odc-importing-codebase-from-git-to-create-application_odc-creating-applications-using-developer-perspective[Creating applications using the Developer perspective].
 
 include::modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc[leveloffset=+1]
 
diff --git a/installing/install_config/customizations.adoc b/installing/install_config/customizations.adoc
index f51bb9a2f500..738b2aad0113 100644
--- a/installing/install_config/customizations.adoc
+++ b/installing/install_config/customizations.adoc
@@ -44,7 +44,7 @@ to @api-approvers (github) or #forum-api-review (slack).
 |Controls the xref:../../authentication/understanding-identity-provider.adoc#understanding-identity-provider[identity provider] and authentication configuration for the cluster.
 
 |`build.config.openshift.io`
-|Controls default and enforced xref:../../builds/build-configuration.adoc#build-configuration[configuration] for all builds on the cluster.
+|Controls default and enforced xref:../../cicd/builds/build-configuration.adoc#build-configuration[configuration] for all builds on the cluster.
 
 |`console.config.openshift.io`
 |Configures the behavior of the web console interface, including the xref:../../web_console/configuring-web-console.adoc#configuring-web-console[logout behavior].
diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc
index 87db331beded..ff2707f41d88 100644
--- a/installing/installing-preparing.adoc
+++ b/installing/installing-preparing.adoc
@@ -82,4 +82,4 @@ For a production cluster, you must configure the following integrations:
 [id="installing-preparing-cluster-for-workloads"]
 == Preparing your cluster for workloads
 
-Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../scalability_and_performance/cnf-performance-addon-operator-for-low-latency-nodes.adoc#cnf-performance-addon-operator-for-low-latency-nodes[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads.
+Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../cicd/builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../scalability_and_performance/cnf-performance-addon-operator-for-low-latency-nodes.adoc#cnf-performance-addon-operator-for-low-latency-nodes[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads.
diff --git a/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc b/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
index bef282cb68c2..4cd352c69462 100644
--- a/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
+++ b/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
@@ -14,7 +14,7 @@ container images. It produces ready-to-run images by injecting application
 source into a container image and assembling a new image. The new image
 incorporates the base image (the builder) and built source. For more
 information, see
-xref:../builds/build-strategies.adoc#build-strategy-s2i_build-strategies[Source-to-Image
+xref:../cicd/builds/build-strategies.adoc#build-strategy-s2i_build-strategies[Source-to-Image
 (S2I) build].
 
 The DPDK base image comes preinstalled with DPDK, and with a build tool that can be used to
diff --git a/operators/admin/olm-managing-custom-catalogs.adoc b/operators/admin/olm-managing-custom-catalogs.adoc
index 5d7b66db5e5a..a2aced4c499a 100644
--- a/operators/admin/olm-managing-custom-catalogs.adoc
+++ b/operators/admin/olm-managing-custom-catalogs.adoc
@@ -50,6 +50,6 @@ include::modules/olm-testing-operator-catalog-image.adoc[leveloffset=+2]
 include::modules/olm-accessing-images-private-registries.adoc[leveloffset=+1]
 .Additional resources
 
-* See xref:../../builds/creating-build-inputs.adoc#builds-secrets-overview_creating-build-inputs[What is a secret?] for more information on the types of secrets, including those used for registry credentials.
+* See xref:../../cicd/builds/creating-build-inputs.adoc#builds-secrets-overview_creating-build-inputs[What is a secret?] for more information on the types of secrets, including those used for registry credentials.
 * See xref:../../openshift_images/managing_images/using-image-pull-secrets.adoc#images-update-global-pull-secret_using-image-pull-secrets[Updating the global cluster pull secret] for more details on the impact of changing this secret.
 * See xref:../../openshift_images/managing_images/using-image-pull-secrets.adoc#images-allow-pods-to-reference-images-from-secure-registries_using-image-pull-secrets[Allowing pods to reference images from other secured registries] for more details on linking pull secrets to service accounts per namespace.
diff --git a/pipelines/images b/pipelines/images
deleted file mode 120000
index 5e67573196d8..000000000000
--- a/pipelines/images
+++ /dev/null
@@ -1 +0,0 @@
-../images
\ No newline at end of file
diff --git a/pipelines/modules b/pipelines/modules
deleted file mode 120000
index 464b823aca16..000000000000
--- a/pipelines/modules
+++ /dev/null
@@ -1 +0,0 @@
-../modules
\ No newline at end of file
diff --git a/security/container_security/security-build.adoc b/security/container_security/security-build.adoc
index 847e64ecc1df..7962147175d6 100644
--- a/security/container_security/security-build.adoc
+++ b/security/container_security/security-build.adoc
@@ -24,12 +24,12 @@ include::modules/security-build-designing.adoc[leveloffset=+1]
 // Knative builds
 include::modules/security-build-knative.adoc[leveloffset=+1]
 .Additional resources
-* xref:../../builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds]
-* xref:../../builds/triggering-builds-build-hooks.adoc#triggering-builds-build-hooks[Triggering and modifying builds]
-* xref:../../builds/creating-build-inputs.adoc#creating-build-inputs[Creating build inputs]
-* xref:../../builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
+* xref:../../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds]
+* xref:../../cicd/builds/triggering-builds-build-hooks.adoc#triggering-builds-build-hooks[Triggering and modifying builds]
+* xref:../../cicd/builds/creating-build-inputs.adoc#creating-build-inputs[Creating build inputs]
+* xref:../../cicd/builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
 ifndef::openshift-origin[]
-* xref:../../architecture/cicd_gitops.adoc#cicd_gitops[The CI/CD methodology and practice]
+// **This section is being moved, update the link once content is in.* add link here[The CI/CD methodology and practice]
 * xref:../../serverless/architecture/serverless-serving-architecture.adoc#serverless-serving-architecture[Knative Serving architecture]
 endif::[]
 * xref:../../applications/application_life_cycle_management/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing application composition using the Topology view]
diff --git a/security/container_security/security-deploy.adoc b/security/container_security/security-deploy.adoc
index 184e4e7ccb81..ed3e33731aaf 100644
--- a/security/container_security/security-deploy.adoc
+++ b/security/container_security/security-deploy.adoc
@@ -26,4 +26,4 @@ include::modules/security-deploy-secrets.adoc[leveloffset=+1]
 // Continuous deployment tooling
 include::modules/security-deploy-continuous.adoc[leveloffset=+1]
 .Additional resources
-* xref:../../builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
+* xref:../../cicd/builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
diff --git a/support/troubleshooting/troubleshooting-s2i.adoc b/support/troubleshooting/troubleshooting-s2i.adoc
index 2dce97a3c08b..cb03cf5a27f8 100644
--- a/support/troubleshooting/troubleshooting-s2i.adoc
+++ b/support/troubleshooting/troubleshooting-s2i.adoc
@@ -16,4 +16,4 @@ include::modules/gathering-application-diagnostic-data.adoc[leveloffset=+1]
 
 == Additional resources
 
-* See xref:../../builds/build-strategies.adoc#build-strategy-s2i_build-strategies[Source-to-Image (S2I) build] for more details about the S2I build strategy.
+* See xref:../../cicd/builds/build-strategies.adoc#build-strategy-s2i_build-strategies[Source-to-Image (S2I) build] for more details about the S2I build strategy.
diff --git a/welcome/index.adoc b/welcome/index.adoc
index 9c27eb98d449..8ce54d508613 100644
--- a/welcome/index.adoc
+++ b/welcome/index.adoc
@@ -110,7 +110,7 @@ The odo CLI tool lets developers create single or multi-component applications
 easily and automates deployment, build, and service route configurations.
 It abstracts complex Kubernetes and {product-title} concepts, allowing developers to focus on developing their applications.
 
-- **xref:../pipelines/understanding-openshift-pipelines.adoc#op-key-features[Create CI/CD Pipelines]**: Pipelines are serverless, cloud-native, continuous integration and continuous deployment systems that run in isolated containers.
+- **xref:../cicd/pipelines/understanding-openshift-pipelines.adoc#op-key-features[Create CI/CD Pipelines]**: Pipelines are serverless, cloud-native, continuous integration and continuous deployment systems that run in isolated containers.
 They use standard Tekton custom resources to automate deployments and are designed for decentralized teams that work on microservices-based architecture.
 
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
@@ -123,7 +123,7 @@ endif::[]
 
 - **xref:../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications using installed Operators into your projects.
 
-- **xref:../builds/understanding-image-builds.adoc#understanding-image-builds[Understand image builds]**: Choose from different build strategies (Docker, S2I, custom, and pipeline) that can include different kinds of source materials (from places like Git repositories, local binary inputs, and external artifacts). Then, follow examples of build types from basic builds to advanced builds.
+- **xref:../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understand image builds]**: Choose from different build strategies (Docker, S2I, custom, and pipeline) that can include different kinds of source materials (from places like Git repositories, local binary inputs, and external artifacts). Then, follow examples of build types from basic builds to advanced builds.
 
 - **xref:../openshift_images/images-understand.adoc#understanding-images[Create container images]**: A container image is the most basic building block in {product-title} (and Kubernetes) applications. Defining image streams lets you gather multiple versions of an image in one place as you continue its development. S2I containers let you insert your source code into a base container that is set up to run code of a particular type (such as Ruby, Node.js, or Python).