diff --git a/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py b/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py
index 2727a263572..3519f8a2c6d 100644
--- a/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py
+++ b/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py
@@ -1,5 +1,6 @@
 import argparse
 
+from setup_app.version import __version__
 from setup_app.utils import base
 
 parser_description='''Use setup.py to configure your Jans Server and to add initial data required for
@@ -8,6 +9,7 @@
 '''
 
 parser = argparse.ArgumentParser(description=parser_description)
+parser.add_argument('--version', action='version', version='%(prog)s ' + __version__)
 parser.add_argument('-c', help="Use command line instead of tui", action='store_true')
 parser.add_argument('-d', help="Installation directory")
 parser.add_argument('-n', help="No interactive prompt before install starts", action='store_true')
diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans.py b/jans-linux-setup/jans_setup/setup_app/installers/jans.py
index 10d6d466030..9f5b2f96586 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/jans.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/jans.py
@@ -8,6 +8,7 @@
 import re
 import requests
 import zipfile
+import site
 
 from pathlib import Path
 
@@ -468,3 +469,18 @@ def post_install_tasks(self):
                 cron_service = 'crond' if base.os_type in ['centos', 'red', 'fedora'] else 'cron'
                 self.restart(cron_service)
 
+
+            # if we are running inside shiv package, copy site pacakages to /opt/dist/jans-setup-packages and add to sys path
+
+            gluu_site_dir = '/opt/dist/jans-setup-packages'
+
+            for p in sys.path:
+                ps = str(p)
+                if '/.shiv/' in ps and ps.endswith('site-packages'):
+                    if not gluu_site_dir in sys.path:
+                        if not os.path.exists(site.USER_SITE):
+                            os.makedirs(site.USER_SITE)
+                        with open(os.path.join(site.USER_SITE, 'jans_setup_site.pth'), 'w') as site_file:
+                            site_file.write(gluu_site_dir)
+                        self.logIt("Copying site packages to {}".format(gluu_site_dir))
+                        shutil.copytree(p, gluu_site_dir, dirs_exist_ok=True)
diff --git a/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py b/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
index 4feae270ab9..9edcfd62f0a 100644
--- a/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
+++ b/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
@@ -1,5 +1,6 @@
 import argparse
 
+from setup_app.version import __version__
 from setup_app.utils import base
 
 parser_description='''Use this script to configure your Jans Server and to add initial data required for
@@ -8,6 +9,7 @@
 '''
 
 parser = argparse.ArgumentParser(description=parser_description)
+parser.add_argument('--version', action='version', version='%(prog)s ' + __version__)
 parser.add_argument('-c', help="Use command line instead of tui", action='store_true')
 parser.add_argument('-d', help="Installation directory")
 parser.add_argument('-f', help="Specify setup.properties file")