diff --git a/CHANGES.txt b/CHANGES.txt
index 18d057d1af..dbdb4c7f4a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,10 @@
-* V2.0.0.1
+* V2.0.1
   * Updated deprecated function in web server to support Python 3.8+
+  * We now use Python to generate ck and ck.bat scripts!
+    If you install CK for different python versions, 
+    you can use a specific one as follows:
+    python3.7 -m ck version
+
 
 * V2.0.0
   * We now use Apache 2.0 license based on the feedback from the majority of users
diff --git a/ck/kernel.py b/ck/kernel.py
index 3900a32b79..d9d854d19e 100755
--- a/ck/kernel.py
+++ b/ck/kernel.py
@@ -27,7 +27,7 @@
 
 
 # We use 3 digits for the main (released) version and 4th digit for development revision
-__version__ = "2.0.0.1"
+__version__ = "2.0.1"
 # Do not use characters (to detect outdated version)!
 
 # Import packages that are global for the whole kernel
@@ -12223,8 +12223,7 @@ def access(i):
 
 
 ##############################################################################
-if __name__ == "__main__":
-
+def cli():
     r = access(sys.argv[1:])
 
     if 'return' not in r:
@@ -12232,3 +12231,8 @@ def access(i):
             'CK access function should always return key \'return\'!')
 
     exit(int(r['return']))
+
+
+##############################################################################
+if __name__ == "__main__":
+    cli()
diff --git a/ck/repo/module/mlperf.inference/module.py b/ck/repo/module/mlperf.inference/module.py
index b211c27ded..8645c2fe03 100644
--- a/ck/repo/module/mlperf.inference/module.py
+++ b/ck/repo/module/mlperf.inference/module.py
@@ -65,7 +65,7 @@ def get_raw_data(i):
     def get_experimental_results_from_cache(cache_dir=None, cache_file=None):
         if cache_dir is None:
             # Check this module's directory.
-            cache_repo_uoa    = 'ck-mlperf'
+            cache_repo_uoa    = ''
             cache_module_uoa  = 'module'
             cache_data_uoa    = 'mlperf.inference'
             r = ck.access({'action':'find',
diff --git a/setup.py b/setup.py
index 71ea2c1b62..75101b39a6 100755
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,7 @@ def run(self):
 
 ############################################################
 # Describing CK setup
-r = setup(
+setup(
     name='ck',
     version=current_version,
 
@@ -417,13 +417,16 @@ def run(self):
                          'repo/test/unicode/.cm/*',
                          'repo/test/unicode/dir/*']},
 
-    scripts=["bin/ck", "bin/ck.bat"],
-
     cmdclass={
         'install': custom_install,
         'install_scripts': custom_install_scripts
     },
 
+    entry_points='''
+        [console_scripts]
+        ck=ck.kernel:cli
+    ''',
+
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",