diff --git a/python/active-jobs-dashboard/server.py b/python/active-jobs-dashboard/server.py
index 190aaf2b..8a9eb0d3 100644
--- a/python/active-jobs-dashboard/server.py
+++ b/python/active-jobs-dashboard/server.py
@@ -2,6 +2,7 @@
 from bottle import route, run, template, request
 from string import capwords
 import ibm_db_dbi as dbi
+import os
 
 conn = None 
 @route('/', method=('GET', 'POST'))
@@ -48,7 +49,7 @@ def static_assets(path):
     with open(path[1:], "rb") as f:
         return f.read()
 
-run(host='0.0.0.0', port=3333, debug=True, reloader=True)
+run(host='0.0.0.0', port=os.getenv('PORT', '3333'), debug=True, reloader=True)
 
 # Example of running bottle with gunicorn:
 # run(host='0.0.0.0', port=3333, debug=True, reloader=True, server='gunicorn', workers=4)
diff --git a/python/bottle-example/sample.py b/python/bottle-example/sample.py
index b2d6fd14..07652d90 100755
--- a/python/bottle-example/sample.py
+++ b/python/bottle-example/sample.py
@@ -4,7 +4,8 @@
 from bottle import request, get, post, static_file, route, run, template
 import ibm_db_dbi as dbi
 from itoolkit import *
-from itoolkit.db2.idb2call import *     #for local jobs
+from itoolkit.db2.idb2call import *  #for local jobs 
+import os   
 
 version = tuple(map(int, dbi.__version__.split('.')))
 if version < (2, 0, 5, 5):
@@ -45,4 +46,4 @@ def cmd_toolkit():
     
     return template('cmd', data=data)
 
-run(host='0.0.0.0', port=9000, debug=True, reloader=True)
+run(host='0.0.0.0', port=os.getenv('PORT', '9000'), debug=True, reloader=True)
diff --git a/python/flask-example/.gitignore b/python/flask-example/.gitignore
new file mode 100755
index 00000000..757ecb33
--- /dev/null
+++ b/python/flask-example/.gitignore
@@ -0,0 +1,2 @@
+env/
+__pycache__/
\ No newline at end of file
diff --git a/python/flask-example/sample-odbc.py b/python/flask-example/flaskr/sample-odbc.py
similarity index 85%
rename from python/flask-example/sample-odbc.py
rename to python/flask-example/flaskr/sample-odbc.py
index 239f9fd1..9cb55e61 100644
--- a/python/flask-example/sample-odbc.py
+++ b/python/flask-example/flaskr/sample-odbc.py
@@ -2,10 +2,11 @@
 # -*- coding: utf-8 -*-
 
 from flask import Flask, render_template, request
-app = Flask(__name__)
 import pyodbc
 from itoolkit import *
-from itoolkit.transport import DatabaseTransport     #for local jobs
+from itoolkit.transport import DatabaseTransport     
+
+app = Flask(__name__)#for local jobs
 
 @app.route('/sample')
 def sample():
@@ -43,4 +44,5 @@ def cmd_toolkit():
     return render_template('cmd.html', data=data)
 
 app.debug = True
-app.run(host='0.0.0.0', port=9000,)
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=int(os.getenv('PORT', 9000)),)
diff --git a/python/flask-example/sample.py b/python/flask-example/flaskr/sample.py
similarity index 88%
rename from python/flask-example/sample.py
rename to python/flask-example/flaskr/sample.py
index 497b8e8b..2958e3c5 100755
--- a/python/flask-example/sample.py
+++ b/python/flask-example/flaskr/sample.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-
 from flask import Flask, render_template, request
-app = Flask(__name__)
 import ibm_db_dbi as dbi
 from itoolkit import *
-from itoolkit.db2.idb2call import *     #for local jobs
+from itoolkit.db2.idb2call import *  #for local jobs
+import os
+
+app = Flask(__name__)
 
 version = tuple(map(int, dbi.__version__.split('.')))
 if version < (2, 0, 5, 5):
@@ -46,4 +47,5 @@ def cmd_toolkit():
     return render_template('cmd.html', data=data)
 
 app.debug = True
-app.run(host='0.0.0.0', port=9000,)
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=int(os.getenv('PORT', 9000)),)
diff --git a/python/flask-example/templates/cmd.html b/python/flask-example/flaskr/templates/cmd.html
similarity index 100%
rename from python/flask-example/templates/cmd.html
rename to python/flask-example/flaskr/templates/cmd.html
diff --git a/python/flask-example/templates/query.html b/python/flask-example/flaskr/templates/query.html
similarity index 100%
rename from python/flask-example/templates/query.html
rename to python/flask-example/flaskr/templates/query.html
diff --git a/python/flask-example/templates/row.html b/python/flask-example/flaskr/templates/row.html
similarity index 100%
rename from python/flask-example/templates/row.html
rename to python/flask-example/flaskr/templates/row.html
diff --git a/python/flask-example/templates/sample.html b/python/flask-example/flaskr/templates/sample.html
similarity index 100%
rename from python/flask-example/templates/sample.html
rename to python/flask-example/flaskr/templates/sample.html
diff --git a/python/flask-example/requirements.txt b/python/flask-example/requirements.txt
index 7e106024..be581806 100644
--- a/python/flask-example/requirements.txt
+++ b/python/flask-example/requirements.txt
@@ -1 +1,9 @@
-flask
+click==8.1.3
+Flask==2.2.2
+importlib-metadata==4.12.0
+itoolkit==1.7.1
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.1
+Werkzeug==2.2.2
+zipp==3.8.1