diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index 40b398bbb..45f293620 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -24,7 +24,6 @@ jobs:
         manylinux:
         - 2014
         cpython_version:
-        - 'cp35-cp35m'
         - 'cp36-cp36m'
         - 'cp37-cp37m'
         - 'cp38-cp38'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c6446d8d3..bd1658bdc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,26 +19,15 @@ jobs:
         - codegen/cpp/fletchgen
         - runtime/cpp
         - platforms/echo/runtime
-        os:
-        - ubuntu-latest
-        include:
-        - source: codegen/cpp/fletchgen
-          os: macos-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install Apache Arrow
-      if: matrix.os == 'ubuntu-latest'
       run: |
         wget https://apache.bintray.com/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb
         sudo apt-get install -y ./apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb
         sudo apt-get update
-        sudo apt-get install -y libarrow-dev=$ARROW_VERSION-1 libarrow100=$ARROW_VERSION-1
-    - name: Install Apache Arrow
-      if: matrix.os == 'macos-latest'
-      run: |
-        brew install apache-arrow
-        brew info apache-arrow | head -n1 | grep "$ARROW_VERSION"
+        sudo apt-get install -y libarrow-dev=$ARROW_VERSION-1
     - name: Configure
       run: |
         cmake ${{ matrix.source }} -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug
@@ -57,32 +46,20 @@ jobs:
         source:
         - runtime/python
         - codegen/python
-        os:
-        - ubuntu-latest
-        - macos-latest
-        exclude:
-        - source: runtime/python
-          os: macos-latest
         include:
         - source: runtime/python
           package: pyfletcher
         - source: codegen/python
           package: pyfletchgen
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install Apache Arrow
-      if: matrix.os == 'ubuntu-latest'
       run: |
         wget https://apache.bintray.com/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb
         sudo apt-get install -y ./apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb
         sudo apt-get update
-        sudo apt-get install -y libarrow-dev=$ARROW_VERSION-1 libarrow100=$ARROW_VERSION-1 libarrow-python-dev=$ARROW_VERSION-1 libarrow-python100=$ARROW_VERSION-1
-    - name: Install Apache Arrow
-      if: matrix.os == 'macos-latest'
-      run: |
-        brew install apache-arrow
-        brew info apache-arrow | head -n1 | grep "$ARROW_VERSION"
+        sudo apt-get install -y libarrow-dev=$ARROW_VERSION-1 libarrow-python-dev=$ARROW_VERSION-1
     - name: Install pyarrow
       run: pip3 install pyarrow==$ARROW_VERSION setuptools wheel
     - name: Build and install
diff --git a/codegen/cpp/fletchgen/CMakeLists.txt b/codegen/cpp/fletchgen/CMakeLists.txt
index 9da69e3b6..dee4d797f 100644
--- a/codegen/cpp/fletchgen/CMakeLists.txt
+++ b/codegen/cpp/fletchgen/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(fletchgen VERSION 0.0.13 LANGUAGES CXX)
+project(fletchgen VERSION 0.0.14 LANGUAGES CXX)
 
 find_package(Arrow 1.0 CONFIG REQUIRED)
 
diff --git a/codegen/python/setup.py b/codegen/python/setup.py
index 455ba3223..6f84c3b35 100644
--- a/codegen/python/setup.py
+++ b/codegen/python/setup.py
@@ -97,7 +97,7 @@ def initialize_options(self):
 
 setup(
     name="pyfletchgen",
-    version="0.0.13",
+    version="0.0.14",
     author="Accelerated Big Data Systems, Delft University of Technology",
     packages=find_packages(),
     url="https://github.com/abs-tudelft/fletcher",
diff --git a/runtime/cpp/CMakeLists.txt b/runtime/cpp/CMakeLists.txt
index 7b880db64..66b3f38e1 100644
--- a/runtime/cpp/CMakeLists.txt
+++ b/runtime/cpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(fletcher VERSION 0.0.13 LANGUAGES CXX)
+project(fletcher VERSION 0.0.14 LANGUAGES CXX)
 
 find_package(Arrow 1.0 CONFIG REQUIRED)
 
diff --git a/runtime/python/setup.py b/runtime/python/setup.py
index fbf12efe1..2b2686dba 100755
--- a/runtime/python/setup.py
+++ b/runtime/python/setup.py
@@ -97,7 +97,7 @@ def initialize_options(self):
 
 setup(
     name="pyfletcher",
-    version="0.0.13",
+    version="0.0.14",
     author="Accelerated Big Data Systems, Delft University of Technology",
     packages=find_packages(),
     description="A Python wrapper for the Fletcher runtime library",