diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0035f53f2..e43316a90 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -230,4 +230,4 @@ jobs:
           # install anaconda for upload
           mamba install anaconda-client
 
-          anaconda upload --label dev noarch/*.tar.bz2
+          anaconda upload --label dev linux-64/*.tar.bz2
diff --git a/continuous_integration/recipe/conda_build_config.yaml b/continuous_integration/recipe/conda_build_config.yaml
new file mode 100644
index 000000000..378349abc
--- /dev/null
+++ b/continuous_integration/recipe/conda_build_config.yaml
@@ -0,0 +1,4 @@
+python:
+    - 3.7
+    - 3.8
+    - 3.9
diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml
index a4f955c91..4a8d9b639 100644
--- a/continuous_integration/recipe/meta.yaml
+++ b/continuous_integration/recipe/meta.yaml
@@ -1,6 +1,5 @@
 {% set name = "dask-sql" %}
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev') + environ.get('VERSION_SUFFIX', '') %}
-{% set py_version=environ.get('CONDA_PY', 36) %}
 
 
 package:
@@ -11,9 +10,12 @@ source:
   git_url: ../..
 
 build:
-  noarch: python
   number: {{ GIT_DESCRIBE_NUMBER }}
-  string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
+  skip: true   # [py2k]
+  entry_points:
+    - dask-sql-server = dask_sql.server.app:main
+    - dask-sql = dask_sql.cmd:main
+  string: py{{ python | replace(".", "") }}{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script: {{ PYTHON }} -m pip install . --no-deps -vv
 
 requirements:
@@ -21,30 +23,42 @@ requirements:
     - maven >=3.6.0
   host:
     - pip
-    - python >=3.6
-    - setuptools_scm
+    - python
+    - setuptools-scm
   run:
-    - python >=3.6
-    - dask ==2021.10.0
+    - python
+    - dask >=2021.10.0
     - pandas >=1.0.0
     - jpype1 >=1.0.2
     - openjdk >=8
     - fastapi >=0.61.1
     - uvicorn >=0.11.3
     - tzlocal >=2.1
-    - prompt_toolkit >=3.0.8
-    - pygments >=2.7.3
-    - nest-asyncio >=1.0.0
-    - tabulate >=0.8.9
+    - prompt-toolkit
+    - pygments
+    - nest-asyncio
+    - tabulate
+    - importlib-metadata  # [py<38]
 
 test:
+  imports:
+    - dask_sql
   commands:
     - pip check
+    - dask-sql-server --help
+    - dask-sql --help
   requires:
     - pip
 
 about:
-  home: https://github.com/dask-contrib/dask-sql
-  summary: SQL Query Layer for dask
+  home: https://github.com/dask-contrib/dask-sql/
+  summary: SQL query layer for Dask
   license: MIT
   license_file: LICENSE.txt
+
+extra:
+  recipe-maintainers:
+    - quasiben
+    - galipremsagar
+    - charlesbluca
+    - nils-braun
diff --git a/setup.py b/setup.py
index 14b20d937..da1bfd137 100755
--- a/setup.py
+++ b/setup.py
@@ -61,8 +61,8 @@ def run(self):
 
 setup(
     name="dask_sql",
-    description="Dask SQL",
-    url="http://github.com/dask-contrib/dask-sql/",
+    description="SQL query layer for Dask",
+    url="https://github.com/dask-contrib/dask-sql/",
     maintainer="Nils Braun",
     maintainer_email="nilslennartbraun@gmail.com",
     license="MIT",
@@ -74,7 +74,7 @@ def run(self):
     python_requires=">=3.6",
     setup_requires=["setuptools_scm"] + sphinx_requirements,
     install_requires=[
-        "dask[dataframe,distributed]==2021.10.0",
+        "dask[dataframe,distributed]>=2021.10.0",
         "pandas>=1.0.0",  # below 1.0, there were no nullable ext. types
         "jpype1>=1.0.2",
         "fastapi>=0.61.1",