diff --git a/.github/workflows/rbc_test.yml b/.github/workflows/rbc_test.yml
index 3b8a9e7f1..8c435962a 100644
--- a/.github/workflows/rbc_test.yml
+++ b/.github/workflows/rbc_test.yml
@@ -112,23 +112,24 @@ jobs:
         numba-version: ['0.56', '0.55']
         heavydb-version: ['6.2', '6.1', '6.0']
         heavydb-from: [conda]
-        # include:
-        #   - os: ubuntu-latest
-        #     python-version: '3.10'
-        #     numba-version: '0.56'
-        #     heavydb-version: dev
-        #     docker-image: heavyai/core-os-cpu-dev:latest
-        #     heavydb-from: docker
-        #   - os: ubuntu-latest
-        #     python-version: '3.10'
-        #     numba-version: '0.55'
-        #     heavydb-version: dev
-        #     docker-image: heavyai/core-os-cpu-dev:latest
-        #     heavydb-from: docker
+        include:
+          - os: ubuntu-latest
+            python-version: '3.10'
+            numba-version: '0.56'
+            heavydb-version: '6.4.4'
+            docker-image: heavyai/heavyai-ee-cpu:v6.4.4
+            heavydb-from: docker
+          - os: ubuntu-latest
+            python-version: '3.10'
+            numba-version: '0.56'
+            heavydb-version: '7.0.1'
+            docker-image: heavyai/heavyai-ee-cpu:v7.0.1
+            heavydb-from: docker
 
     needs: lint
 
     steps:
+
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -160,6 +161,14 @@ jobs:
         run: |
           mamba create -n heavydb-env heavydb=${{ matrix.heavydb-version }}*=*_cpu -c conda-forge
 
+      - name: Configure secrets
+        shell: bash -l {0}
+        env:
+          HEAVYDB_LICENSE: ${{ secrets.HEAVYDB }}
+        run: |
+          # dump secrets to file
+          echo "${HEAVYDB_LICENSE}" > ./.heavyai/license.txt
+
       - name: Build heavydb docker image and run it [docker]
         shell: bash -l {0}
         env:
@@ -226,7 +235,6 @@ jobs:
           RBC_TESTS_FULL: TRUE
         run: |
           mamba run -n rbc pytest -sv -r A rbc/tests/heavydb/ -x
-          pkill -f heavydb
           mamba run -n rbc pytest -sv -r A rbc/tests/ -x --ignore rbc/tests/heavydb
 
       - name: Run rbc tests
@@ -277,7 +285,7 @@ jobs:
         timeout-minutes: 2
         if: ${{ failure() && matrix.os == 'ubuntu-latest' && matrix.heavydb-from == 'docker' }}
         run: |
-          mamba run -n docker docker-compose logs --no-color --tail=10000 -f -t \> heavydb-docker.log
+          mamba run -n docker docker-compose logs --no-color --tail=10000 -f -t > heavydb-docker.log
           cat heavydb-docker.log
 
   eval-notebooks:
diff --git a/.heavyai/heavyai.conf b/.heavyai/heavyai.conf
index 9918b798e..6c1c84579 100644
--- a/.heavyai/heavyai.conf
+++ b/.heavyai/heavyai.conf
@@ -1,5 +1,6 @@
 enable-runtime-udfs = true
 enable-table-functions = true
 enable-dev-table-functions = true
+enable-udf-registration-for-all-users = true
 cpu-only = true
-log-severity = DEBUG4
\ No newline at end of file
+license = "/var/lib/heavyai/license.txt"
\ No newline at end of file
diff --git a/.omnisci/omnisci.conf b/.omnisci/omnisci.conf
index 0180a3145..8ac6649c8 100644
--- a/.omnisci/omnisci.conf
+++ b/.omnisci/omnisci.conf
@@ -3,4 +3,4 @@ enable-table-functions = true
 enable-dev-table-functions = true
 enable-udf-registration-for-all-users = true
 cpu-only = true
-log-severity = DEBUG4
+license = license.txt
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7278d41a4..82bffc140 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,4 +9,5 @@ services:
       - 6278:6278
       - 6279:6279
     volumes:
-      - ./.omnisci/omnisci.conf:/omnisci-storage/omnisci.conf
\ No newline at end of file
+      - ./.heavyai/heavyai.conf:/var/lib/heavyai/heavy.conf
+      - ./.heavyai/license.txt:/var/lib/heavyai/license.txt
diff --git a/rbc/tests/heavydb/test_array.py b/rbc/tests/heavydb/test_array.py
index 19f6ab19c..c2f73e1dc 100644
--- a/rbc/tests/heavydb/test_array.py
+++ b/rbc/tests/heavydb/test_array.py
@@ -374,6 +374,7 @@ def array_is_null(size):
         ('double', 'f8', 'fpext')]
 
 
+@pytest.mark.skip()
 @pytest.mark.parametrize("typ, col, suffix", inps,
                          ids=[item[-1] for item in inps])
 def test_issue197(heavydb, typ, col, suffix):
diff --git a/rbc/tests/heavydb/test_geolinestring.py b/rbc/tests/heavydb/test_geolinestring.py
index 8ee847a19..a40b22078 100644
--- a/rbc/tests/heavydb/test_geolinestring.py
+++ b/rbc/tests/heavydb/test_geolinestring.py
@@ -5,7 +5,7 @@
 
 @pytest.fixture(scope='module')
 def heavydb():
-    for o in heavydb_fixture(globals(), minimal_version=(6, 4),
+    for o in heavydb_fixture(globals(), minimal_version=(7, 0),
                              suffices=['linestring', 'multilinestring',
                                        'multipoint',
                                        'polygon', 'multipolygon']):
diff --git a/rbc/tests/heavydb/test_geomultipolygon.py b/rbc/tests/heavydb/test_geomultipolygon.py
index 239537497..8d4015ee0 100644
--- a/rbc/tests/heavydb/test_geomultipolygon.py
+++ b/rbc/tests/heavydb/test_geomultipolygon.py
@@ -5,7 +5,7 @@
 
 @pytest.fixture(scope='module')
 def heavydb():
-    for o in heavydb_fixture(globals(), minimal_version=(6, 4),
+    for o in heavydb_fixture(globals(), minimal_version=(7, 0),
                              suffices=['multipolygon']):
         define(o)
         yield o
diff --git a/rbc/tests/heavydb/test_geopoint.py b/rbc/tests/heavydb/test_geopoint.py
index d92de36bd..21d8fa18e 100644
--- a/rbc/tests/heavydb/test_geopoint.py
+++ b/rbc/tests/heavydb/test_geopoint.py
@@ -6,7 +6,7 @@
 
 @pytest.fixture(scope='module')
 def heavydb():
-    for o in heavydb_fixture(globals(), minimal_version=(6, 4),
+    for o in heavydb_fixture(globals(), minimal_version=(7, 0),
                              suffices=['point']):
         define(o)
         yield o
diff --git a/rbc/tests/heavydb/test_geopolygon.py b/rbc/tests/heavydb/test_geopolygon.py
index 8a2b56b31..265d38e01 100644
--- a/rbc/tests/heavydb/test_geopolygon.py
+++ b/rbc/tests/heavydb/test_geopolygon.py
@@ -5,7 +5,7 @@
 
 @pytest.fixture(scope='module')
 def heavydb():
-    for o in heavydb_fixture(globals(), minimal_version=(6, 4),
+    for o in heavydb_fixture(globals(), minimal_version=(7, 0),
                              suffices=['polygon']):
         define(o)
         yield o