diff --git a/olm/Makefile b/olm/Makefile
new file mode 100644
index 0000000..c263a30
--- /dev/null
+++ b/olm/Makefile
@@ -0,0 +1,26 @@
+# Makefile for building and pushing the WandB Operator image
+
+# Define variables
+IMAGE ?= wandb-operator                       # Name of the Docker image
+QUAY_DOCKER_REGISTRY ?= quay.io                # Docker registry URL
+QUAY_PROJECT ?= wandb_tools                   # Project name in the registry
+VERSION ?= latest                              # Default version for the image
+BRANCH ?= main                                 # Default branch for tagging
+
+# Targets
+
+# Build the Docker image
+build-image:
+	docker build -t $(QUAY_DOCKER_REGISTRY)/$(QUAY_PROJECT)/$(IMAGE):$(VERSION) \
+	-f olm-catalog/bundle.Dockerfile olm-catalog/
+	
+	docker tag $(QUAY_DOCKER_REGISTRY)/$(QUAY_PROJECT)/$(IMAGE):$(VERSION) \
+	$(QUAY_DOCKER_REGISTRY)/$(QUAY_PROJECT)/$(IMAGE):$(BRANCH)
+
+# Build and push the Docker image to the registry
+build-push:
+	docker push $(QUAY_DOCKER_REGISTRY)/$(QUAY_PROJECT)/$(IMAGE):$(VERSION)
+	docker push $(QUAY_DOCKER_REGISTRY)/$(QUAY_PROJECT)/$(IMAGE):$(BRANCH)
+
+# Specify that these targets do not represent files
+.PHONY: build-image build-push
diff --git a/docs/OLM_Bundle.md b/olm/docs/OLM_Bundle.md
similarity index 100%
rename from docs/OLM_Bundle.md
rename to olm/docs/OLM_Bundle.md
diff --git a/docs/OLM_Testing_Guide.md b/olm/docs/OLM_Testing_Guide.md
similarity index 100%
rename from docs/OLM_Testing_Guide.md
rename to olm/docs/OLM_Testing_Guide.md
diff --git a/bundle.Dockerfile b/olm/olm-catalog/bundle.Dockerfile
similarity index 100%
rename from bundle.Dockerfile
rename to olm/olm-catalog/bundle.Dockerfile
diff --git a/bundle/ci.yaml b/olm/olm-catalog/ci.yaml
similarity index 100%
rename from bundle/ci.yaml
rename to olm/olm-catalog/ci.yaml
diff --git a/bundle/manifests/apps.wandb.com_weightsandbiases.yaml b/olm/olm-catalog/manifests/apps.wandb.com_weightsandbiases.yaml
similarity index 100%
rename from bundle/manifests/apps.wandb.com_weightsandbiases.yaml
rename to olm/olm-catalog/manifests/apps.wandb.com_weightsandbiases.yaml
diff --git a/bundle/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrole.yaml b/olm/olm-catalog/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrole.yaml
similarity index 100%
rename from bundle/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrole.yaml
rename to olm/olm-catalog/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/bundle/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/olm/olm-catalog/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
similarity index 100%
rename from bundle/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
rename to olm/olm-catalog/manifests/wandb-operator-manager_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/wandb-operator.clusterserviceversion.yaml b/olm/olm-catalog/manifests/wandb-operator.clusterserviceversion.yaml
similarity index 100%
rename from bundle/manifests/wandb-operator.clusterserviceversion.yaml
rename to olm/olm-catalog/manifests/wandb-operator.clusterserviceversion.yaml
diff --git a/bundle/metadata/annotations.yaml b/olm/olm-catalog/metadata/annotations.yaml
similarity index 100%
rename from bundle/metadata/annotations.yaml
rename to olm/olm-catalog/metadata/annotations.yaml
diff --git a/bundle/tests/scorecard/config.yaml b/olm/olm-catalog/tests/scorecard/config.yaml
similarity index 100%
rename from bundle/tests/scorecard/config.yaml
rename to olm/olm-catalog/tests/scorecard/config.yaml
diff --git a/olm/olm-sample-configs/catalogSource.yaml b/olm/olm-sample-configs/catalogSource.yaml
new file mode 100644
index 0000000..48914da
--- /dev/null
+++ b/olm/olm-sample-configs/catalogSource.yaml
@@ -0,0 +1,12 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: wandb-operator-catalog
+  labels:
+    app.kubernetes.io/part-of: wandb-operator
+spec:
+  sourceType: grpc
+  image: quay.io/wandb_tools/wandb-operator-index:<release_tag>
+  updateStrategy:
+    registryPoll:
+      interval: 5m