diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5438bcffdbda02fc7d4ac8dbc3d0a64dfa51fb3f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,40 @@
+image: python:latest
+
+cache:
+  paths:
+    - .tox
+
+stages:
+  - test
+  - publish
+
+before_script:
+  - apt-get update -yqq
+    && apt-get install -yqq --no-install-recommends
+    make
+    g++
+    && apt-get autoremove -yqq --purge
+    && apt-get clean
+
+unittests:
+  stage: test
+  script:
+    - pip install tox==4.12
+    - tox -v -e pytest
+
+pypi_publish:
+  before_script:
+   - pip install twine
+  only:
+   - master
+  stage: publish
+  when: on_success
+  script:
+    - pip install twine
+    - python setup.py sdist bdist_wheel
+    - python -m twine upload
+     --skip-existing
+     --repository-url https://pypi.clarin-pl.eu/
+     -u $PIPY_USER
+     -p $PIPY_PASS
+     dist/combo*.whl
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index a2c216db8698c3e42dbb41233daed6ddc76059f3..0000000000000000000000000000000000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[aliases]
-test=pytest
-
-[tox:tox]
-envlist = py38
-skipsdist = True
-
-[testenv:pytest]
-deps = pytest
-commands = pytest
-
-[metadata]
-description-file = README.md
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..8f80b8d00569397abc208c91271ec9788ff70224
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py38,py39,py310
+
+[testenv]
+deps = pytest
+commands = pytest {posargs}
\ No newline at end of file