diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4758acaf31..577a476800 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -442,11 +442,21 @@ jobs:
               --tag quay.io/influxdb/iox_data_generator:"$COMMIT_SHA" \
               --tag quay.io/influxdb/iox_data_generator:"$BRANCH" \
               .
+            docker buildx build \
+              --build-arg FEATURES="" \
+              --build-arg PACKAGE="iox_gitops_adapter" \
+              --build-arg RUST_VERSION="$RUST_VERSION" \
+              --build-arg RUSTFLAGS="-C target-feature=+avx2 -C link-arg=-fuse-ld=lld" \
+              --progress plain \
+              --tag quay.io/influxdb/iox_gitops_adapter:"$COMMIT_SHA" \
+              --tag quay.io/influxdb/iox_gitops_adapter:"$BRANCH" \
+              .
 
             docker run -it --rm quay.io/influxdb/iox:$COMMIT_SHA debug print-cpu
 
             docker push --all-tags quay.io/influxdb/iox
             docker push --all-tags quay.io/influxdb/iox_data_generator
+            docker push --all-tags quay.io/influxdb/iox_gitops_adapter
 
             echo "export COMMIT_SHA=${COMMIT_SHA}" >> $BASH_ENV
           # linking might take a while and doesn't produce CLI output
@@ -537,7 +547,7 @@ workflows:
     jobs:
       - ci_image
 
-  # Manual build of perf image.
+  # Manual build of release image for a branch.
   # Trigger using the CircleCI API, like so:
   #
   #   # e.g. using 'xh' (https://github.com/ducaale/xh)
diff --git a/Cargo.lock b/Cargo.lock
index 2666013671..6cc6a9ab07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1509,36 +1509,6 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
-[[package]]
-name = "gitops_adapter"
-version = "0.1.0"
-dependencies = [
- "assert_matches",
- "async-trait",
- "chrono",
- "clap 3.0.14",
- "dotenv",
- "futures",
- "glob",
- "k8s-openapi",
- "kube",
- "kube-derive",
- "kube-runtime",
- "parking_lot 0.11.2",
- "pbjson-build",
- "prost",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tonic",
- "tonic-build",
- "tracing",
- "trogging",
- "workspace-hack",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -2176,6 +2146,36 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "iox_gitops_adapter"
+version = "0.1.0"
+dependencies = [
+ "assert_matches",
+ "async-trait",
+ "chrono",
+ "clap 3.0.14",
+ "dotenv",
+ "futures",
+ "glob",
+ "k8s-openapi",
+ "kube",
+ "kube-derive",
+ "kube-runtime",
+ "parking_lot 0.11.2",
+ "pbjson-build",
+ "prost",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tonic",
+ "tonic-build",
+ "tracing",
+ "trogging",
+ "workspace-hack",
+]
+
 [[package]]
 name = "iox_object_store"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 83995af82c..37806b94a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "db",
     "dml",
     "generated_types",
-    "gitops_adapter",
     "grpc-router",
     "grpc-router-test-gen",
     "influxdb_iox",
@@ -23,6 +22,7 @@ members = [
     "internal_types",
     "iox_catalog",
     "iox_data_generator",
+    "iox_gitops_adapter",
     "iox_object_store",
     "job_registry",
     "lifecycle",
diff --git a/gitops_adapter/Cargo.toml b/iox_gitops_adapter/Cargo.toml
similarity index 95%
rename from gitops_adapter/Cargo.toml
rename to iox_gitops_adapter/Cargo.toml
index e4573ea206..d79ed6f8b1 100644
--- a/gitops_adapter/Cargo.toml
+++ b/iox_gitops_adapter/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gitops_adapter"
+name = "iox_gitops_adapter"
 version = "0.1.0"
 authors = ["Luke Bond <luke.n.bond@gmail.com>"]
 edition = "2021"
@@ -8,7 +8,7 @@ edition = "2021"
 publish = false
 
 [[bin]]
-name = "iox-gitops-adapter"
+name = "iox_gitops_adapter"
 path = "src/main.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/gitops_adapter/build.rs b/iox_gitops_adapter/build.rs
similarity index 100%
rename from gitops_adapter/build.rs
rename to iox_gitops_adapter/build.rs
diff --git a/gitops_adapter/src/kafka_topic_list/api.rs b/iox_gitops_adapter/src/kafka_topic_list/api.rs
similarity index 100%
rename from gitops_adapter/src/kafka_topic_list/api.rs
rename to iox_gitops_adapter/src/kafka_topic_list/api.rs
diff --git a/gitops_adapter/src/kafka_topic_list/mock_api.rs b/iox_gitops_adapter/src/kafka_topic_list/mock_api.rs
similarity index 100%
rename from gitops_adapter/src/kafka_topic_list/mock_api.rs
rename to iox_gitops_adapter/src/kafka_topic_list/mock_api.rs
diff --git a/gitops_adapter/src/kafka_topic_list/mod.rs b/iox_gitops_adapter/src/kafka_topic_list/mod.rs
similarity index 100%
rename from gitops_adapter/src/kafka_topic_list/mod.rs
rename to iox_gitops_adapter/src/kafka_topic_list/mod.rs
diff --git a/gitops_adapter/src/kafka_topic_list/resources.rs b/iox_gitops_adapter/src/kafka_topic_list/resources.rs
similarity index 100%
rename from gitops_adapter/src/kafka_topic_list/resources.rs
rename to iox_gitops_adapter/src/kafka_topic_list/resources.rs
diff --git a/gitops_adapter/src/main.rs b/iox_gitops_adapter/src/main.rs
similarity index 99%
rename from gitops_adapter/src/main.rs
rename to iox_gitops_adapter/src/main.rs
index 65c63ff0f1..004d5895e6 100644
--- a/gitops_adapter/src/main.rs
+++ b/iox_gitops_adapter/src/main.rs
@@ -54,16 +54,16 @@ enum CatalogError {
 // [Clap]: https://github.com/clap-rs/clap
 #[derive(Debug, clap::Parser)]
 #[clap(
-    name = "iox-gitops-adapter",
+    name = "iox_gitops_adapter",
     about = "Adapter to configure IOx Catalog from Kubernetes Custom Resources",
     long_about = r#"Kubernetes controller responsible for synchronising the IOx Catalog to cluster configuration in a Kubernetes Custom Resource.
 
 Examples:
     # Run the gitops adapter server:
-    iox-gitops-adapter
+    iox_gitops_adapter
 
     # See all configuration options
-    iox-gitops-adapter --help
+    iox_gitops_adapter --help
 "#,
     version = concat!(env!("CARGO_PKG_VERSION"), " - ", env!("GIT_HASH"))
 )]
@@ -348,7 +348,7 @@ async fn main() {
     let _drop_handle = setup_tracing(&config.logging_config, None).unwrap();
     debug!(?config, "loaded config");
 
-    info!(git_hash = env!("GIT_HASH"), "starting iox-gitops-adapter");
+    info!(git_hash = env!("GIT_HASH"), "starting iox_gitops_adapter");
 
     let k8s_client = K8sClient::try_default()
         .await
diff --git a/gitops_adapter/test/mock-iox-failure.sh b/iox_gitops_adapter/test/mock-iox-failure.sh
similarity index 100%
rename from gitops_adapter/test/mock-iox-failure.sh
rename to iox_gitops_adapter/test/mock-iox-failure.sh
diff --git a/gitops_adapter/test/mock-iox-multi-topic.sh b/iox_gitops_adapter/test/mock-iox-multi-topic.sh
similarity index 100%
rename from gitops_adapter/test/mock-iox-multi-topic.sh
rename to iox_gitops_adapter/test/mock-iox-multi-topic.sh
diff --git a/gitops_adapter/test/mock-iox-single-topic.sh b/iox_gitops_adapter/test/mock-iox-single-topic.sh
similarity index 100%
rename from gitops_adapter/test/mock-iox-single-topic.sh
rename to iox_gitops_adapter/test/mock-iox-single-topic.sh