diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 724094b..14b31e0 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -3,7 +3,7 @@ name: pre-commit
 on:
   pull_request:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   pre-commit:
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6c43a19..66539ae 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -2,9 +2,8 @@ name: Main
 
 on:
   push:
-    branches: master
+    branches: main
   pull_request:
-    branches: master
 
 jobs:
   tests:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f217692..6d262ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,7 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
+        exclude: "docs"
 
   - repo: https://gitlab.com/pycqa/flake8
     rev: 4.0.1
@@ -21,3 +22,4 @@ repos:
     hooks:
     - id: mypy
       files: ibis_heavyai/
+      exclude: "ibis_heavyai/tests"
\ No newline at end of file
diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml
index cf9f1d5..b441aa5 100644
--- a/ci/docker-compose.yaml
+++ b/ci/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.9'
 services:
 
   heavydb:
@@ -8,10 +8,12 @@ services:
       - 6274:6274
       - 6278:6278
     volumes:
-      - ./heavydb.conf:/heavydb-storage/heavydb.conf
+      - ./heavydb.conf:/var/lib/heavyai/heavy.conf:ro
 
   waiter:
     image: jwilder/dockerize
+    depends_on:
+      - heavydb
     command: |
       dockerize -wait tcp://heavydb:6274
         -wait-retry-interval 5s
diff --git a/ci/heavydb.conf b/ci/heavydb.conf
index f1d996e..1493efe 100644
--- a/ci/heavydb.conf
+++ b/ci/heavydb.conf
@@ -4,3 +4,5 @@ cpu-only = true
 enable-watchdog = false
 enable-window-functions = true
 cpu-buffer-mem-bytes = 1000000000
+allowed-export-paths = ["/tmp"]
+allowed-import-paths = ["/tmp"]
diff --git a/environment.yaml b/environment.yaml
index 35f57c2..102f90b 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -7,7 +7,7 @@ dependencies:
 
 # core
 - python >=3.7
-- ibis-framework-core >=2.0
+- ibis-framework-core >=2.0, <3
 - heavyai
 - rbc >=0.8.0
 - pyarrow
diff --git a/ibis_heavyai/tests/test_client.py b/ibis_heavyai/tests/test_client.py
index 97ac8e1..4072a99 100644
--- a/ibis_heavyai/tests/test_client.py
+++ b/ibis_heavyai/tests/test_client.py
@@ -218,7 +218,7 @@ def test_explain(con, alltypes):
 
 @pytest.mark.parametrize(
     'filename',
-    ["./test_read_csv.csv", pathlib.Path("./test_read_csv.csv")],
+    ["/tmp/test_read_csv.csv", pathlib.Path("/tmp/test_read_csv.csv")],
 )
 def test_read_csv(con, temp_table, filename, alltypes, df_alltypes):
     schema = alltypes.schema()
diff --git a/pyproject.toml b/pyproject.toml
index 4ce6ede..8fb17aa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ibis-framework >=2.0",
+    "ibis-framework >=2.0, <3",
     "heavyai",
     "rbc-project >=0.8.0",
     "pyarrow >=3.0.0",
@@ -61,7 +61,6 @@ exclude = [
 line-length = 79
 skip-string-normalization = true
 target-version = ["py37", "py38", "py39", "py310"]
-exclude = "docs"
 
 [tool.isort]
 ensure_newline_before_comments = true
@@ -71,9 +70,6 @@ include_trailing_comma = true
 
 [tool.mypy]
 ignore_missing_imports = true
-exclude = [
-    'ibis_heavyai/tests',
-]
 
 [tool.pytest.ini_options]
 minversion = "6.0"
@@ -93,4 +89,17 @@ markers = [
     "only_on_backends",  # replaced by notimpl ibis>2.1.2
     "notimpl",
     "min_spark_version",
+    "never",
+    "broken",
+    "sqlite",
+    "pyspark",
+    "postgres",
+    "pandas",
+    "mysql",
+    "impala",
+    "duckdb",
+    "datafusion",
+    "dask",
+    "clickhouse",
+    "heavyai",
 ]