diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 3297625..0000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# flutter_only
-task:
-  container:
-    image: cirrusci/flutter:stable
-  env:
-    TEKARTIK_CI_CIRRUS: true
-  setup_script:
-    - cd ci_support
-    - pub get
-    - dart tool/cirrus_ci_setup.dart
-  matrix:
-    - name: test
-      script:
-        - cd ci_support
-        - dart tool/cirrus_ci_test.dart
diff --git a/.gitignore b/.gitignore
index 082d691..63b48ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ doc/api/
 # IDE
 .vscode/
 .idea/
-*.iml
\ No newline at end of file
+*.iml
+
diff --git a/ci/pubspec.yaml b/ci/pubspec.yaml
index 24f0332..03e4c38 100644
--- a/ci/pubspec.yaml
+++ b/ci/pubspec.yaml
@@ -25,4 +25,5 @@ dev_dependencies:
   test: ">=1.6.0"
 executables:
   setup_sqlite3lib:
-  setup_portaudiolib:
\ No newline at end of file
+  setup_portaudiolib:
+resolution: workspace
diff --git a/ci_support/pubspec.yaml b/ci_support/pubspec.yaml
index e47456c..661c87a 100644
--- a/ci_support/pubspec.yaml
+++ b/ci_support/pubspec.yaml
@@ -29,6 +29,5 @@ dev_dependencies:
       ref: dart3a
       path: packages/lints
 
-dependency_overrides:
-  tekartik_ci:
-    path: ../ci
+
+resolution: workspace
diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 0000000..c534c63
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,8 @@
+name: _
+publish_to: none
+environment:
+  sdk: ^3.6.0
+workspace:
+  - ci_support
+  - repo_support
+  - ci
diff --git a/repo_support/pubspec.yaml b/repo_support/pubspec.yaml
index 554ff66..131a9cc 100644
--- a/repo_support/pubspec.yaml
+++ b/repo_support/pubspec.yaml
@@ -19,3 +19,5 @@ dev_dependencies:
   dev_build:
   lints: '>=1.0.0'
 
+resolution: workspace
+