diff --git a/docs/book/src/03_topics/02_configuration/01_air-gapped-environtment.md b/docs/book/src/03_topics/02_configuration/01_air-gapped-environtment.md
index 38349c0cc..7e6352c4d 100644
--- a/docs/book/src/03_topics/02_configuration/01_air-gapped-environtment.md
+++ b/docs/book/src/03_topics/02_configuration/01_air-gapped-environtment.md
@@ -80,6 +80,17 @@ Example layout for a `kubeadm` provider may look like:
 - `control-plane-components.yaml`
 - `bootstrap-components.yaml`
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.
+=======
+See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.<br>
+Other tools, such as [oras](https://oras.land/docs/), behvae in a similar fashion and can also be used to build and publish the OCI artifacts.
+>>>>>>> 11a4553 (add a note on how to enable fetching oci artifacts using plain http)
+=======
+See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.
+>>>>>>> a58babb (remove note about using oras)
+
 To fetch provider components which are stored as an OCI artifact, you can configure `fetchConfig.oci` field to pull them directly from an OCI registry:
 
 ```yaml
@@ -96,6 +107,22 @@ spec:
     oci: "my-oci-registry.example.com/my-provider:v1.9.3"
 ```
 
+You can likewise configure `fetchConfig.oci` to use plain http rather than https if so desired. This should only be used for development purposes as it can be insecure:
+
+```yaml
+apiVersion: operator.cluster.x-k8s.io/v1alpha2
+kind: InfrastructureProvider
+metadata:
+  name: azure
+  namespace: capz-system
+spec:
+  version: v1.9.3
+  configSecret:
+    name: azure-variables
+  fetchConfig:
+    oci: "http://my-oci-registry.example.com/my-provider:v1.9.3"
+```
+
 ## OCI Authentication
 
 To securely authenticate with an OCI registry, environment variables are used for user credentials. The following environment variables are involved: