diff --git a/pyproject.toml b/pyproject.toml
index b0de8a7f..4f2fae35 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ from = 'src'
 include = 'pysonar_scanner'
 
 [tool.poetry.scripts]
-pysonar = 'pysonar_scanner.__main__:scan'
+pysonar = 'pysonar_scanner.__main__:entry_point'
 
 [[tool.poetry.source]]
 name = 'jfrog-server'
diff --git a/src/pysonar_scanner/__main__.py b/src/pysonar_scanner/__main__.py
index 786ae8f4..e8a91ad5 100644
--- a/src/pysonar_scanner/__main__.py
+++ b/src/pysonar_scanner/__main__.py
@@ -47,6 +47,9 @@ def scan():
     except Exception as e:
         return exceptions.log_error(e)
 
+def entry_point():
+    # Ensure the exit code is properly returned to the shell
+    exit(scan())
 
 def do_scan():
     app_logging.setup()