diff --git a/.gitlab-ci-docker.yaml b/.gitlab-ci-docker.yaml
index 1a3b7f6caf610e6a788d318f108a0c4b6594a3d0..b849f7958a970061b1c3f283f434d4a1ee2f9b5c 100644
--- a/.gitlab-ci-docker.yaml
+++ b/.gitlab-ci-docker.yaml
@@ -3,7 +3,6 @@ stages:
   - data-supply
   - e2e-test
 
-
 variables:
 
   PGPASSWORD: $HIVEMIND_POSTGRES_PASSWORD
diff --git a/hive/cli.py b/hive/cli.py
index b2c4a88a23968c02edd4021336c3fc4d625f1a95..6b8d467248f3f9cf773056658bdd92e2939d9b8c 100755
--- a/hive/cli.py
+++ b/hive/cli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """CLI service router"""
 
diff --git a/hive/utils/profiler.py b/hive/utils/profiler.py
index 809e9b9c7ba9e0e55340a6818ce350a9b40b36c7..22c59a4b1f8754b47fa35f027b4703e61aa795ab 100755
--- a/hive/utils/profiler.py
+++ b/hive/utils/profiler.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3
+#!/usr/bin/env python3
 """Hive profiling tools"""
 
 import cProfile
diff --git a/scripts/ci/benchmark_generator.py b/scripts/ci/benchmark_generator.py
index ae679c9127937355a45a7a766b5de0866357c366..e32358b5ab7d5ee4ed51f72adfb02b4b0c40b7be 100755
--- a/scripts/ci/benchmark_generator.py
+++ b/scripts/ci/benchmark_generator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from json import dumps
 
diff --git a/scripts/ci/json_report_parser.py b/scripts/ci/json_report_parser.py
index 7403dfd3130380af606e9245c571aa446d450726..38ff91a359915b84ccc9a2612aa0f7be75964aef 100755
--- a/scripts/ci/json_report_parser.py
+++ b/scripts/ci/json_report_parser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 """ Parse json file generated by pytest benchmarks and create htm report file
     for files exceeding expected threshold print information to the console
 """
diff --git a/scripts/ci/start_api_benchmark.py b/scripts/ci/start_api_benchmark.py
index 92fb6e73d6107beeea3aa40b167f1ac5975831a1..cf726cc3b034d1eae333e07d02c41ade9a30cf32 100755
--- a/scripts/ci/start_api_benchmark.py
+++ b/scripts/ci/start_api_benchmark.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 import os
 import subprocess
 from json import load, dump
@@ -60,7 +60,7 @@ if __name__ == "__main__":
 
     hivemind_url = "http://{}:{}".format(args.hivemind_address, args.hivemind_port)
     test_directories = get_test_directories(args.tests_root_dir)
-    
+
     benchmarks_files = []
     for test_directory in test_directories:
         benchmark_file_name = "benchmark_" + test_directory.split("/")[-1] + ".py"
diff --git a/scripts/operation_extractor.py b/scripts/operation_extractor.py
index 1a25c0329dc80ccbe5b186a33229cb6e7850cdab..f7821c7e984cc9558ffc7c475028cb2f4e14f328 100755
--- a/scripts/operation_extractor.py
+++ b/scripts/operation_extractor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 """
 This script will scan blocks from range `from_block` to `to_block` if it finds operation defined in `operations` it will
 save such block to a `output_file`. Blocks not containing any operations from list `operations` will be saved empty.
diff --git a/scripts/xml_report_parser.py b/scripts/xml_report_parser.py
index f229e9fc8ebf2c115f51a7255dfc000f31bc657b..de29772234ef88871ed12a3e733e304635bc5c0b 100755
--- a/scripts/xml_report_parser.py
+++ b/scripts/xml_report_parser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 import os
 
 from xml.dom import minidom
diff --git a/tests/manual_tests/list_comments_by_author_last_update_test.py b/tests/manual_tests/list_comments_by_author_last_update_test.py
index 815e9657d472069963aae005bb667971be11a329..06e072dc8f227e8fd465783a7d046e39604cd567 100644
--- a/tests/manual_tests/list_comments_by_author_last_update_test.py
+++ b/tests/manual_tests/list_comments_by_author_last_update_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from test_base import run_test
 
diff --git a/tests/manual_tests/list_comments_by_cashout_test.py b/tests/manual_tests/list_comments_by_cashout_test.py
index 77ca37fe52cbd711ebfce1ab7ccac484b24d80f8..4ec3609b4edca01fb071da9012e266372e43bdd4 100644
--- a/tests/manual_tests/list_comments_by_cashout_test.py
+++ b/tests/manual_tests/list_comments_by_cashout_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from test_base import run_test
 
 if __name__ == '__main__':
diff --git a/tests/manual_tests/list_comments_by_parent_test.py b/tests/manual_tests/list_comments_by_parent_test.py
index 944479b37d18bfc191d709a119805856bf55a11b..ea1d8019066b7c4dce9c72e04f6d54de6dbdeb19 100644
--- a/tests/manual_tests/list_comments_by_parent_test.py
+++ b/tests/manual_tests/list_comments_by_parent_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from test_base import run_test
 
 if __name__ == '__main__':
diff --git a/tests/manual_tests/list_comments_by_permlink.py b/tests/manual_tests/list_comments_by_permlink.py
index 56c3de3b2eabf394578c5ebfea22c0f768a40094..6d8db7e22203aebb7ade7b541de932ae1eb640a2 100644
--- a/tests/manual_tests/list_comments_by_permlink.py
+++ b/tests/manual_tests/list_comments_by_permlink.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from test_base import run_test
 
 if __name__ == '__main__':
diff --git a/tests/manual_tests/list_comments_by_root_test.py b/tests/manual_tests/list_comments_by_root_test.py
index 5caf5e423d6bcd292343d651a5b9ec2b3da2cdde..00a01544c4b88479fb6b2876903f83684abebc67 100644
--- a/tests/manual_tests/list_comments_by_root_test.py
+++ b/tests/manual_tests/list_comments_by_root_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from test_base import run_test
 
 if __name__ == '__main__':
@@ -6,7 +6,7 @@ if __name__ == '__main__':
     test_hive_node_url = 'http://127.0.0.1:8080'
 
     payload = {
-        "jsonrpc" : "2.0", 
+        "jsonrpc" : "2.0",
         "method" : "database_api.list_comments",
         "params" : {
             "start" : ['steemit', 'firstpost', '', ''],
diff --git a/tests/manual_tests/list_comments_by_update_test.py b/tests/manual_tests/list_comments_by_update_test.py
index 53b4fe5f7224c279e8a073c30ac1088f6bba8d5f..f7c3efd4f303db4e8110a8c094b378d6f0c4e017 100644
--- a/tests/manual_tests/list_comments_by_update_test.py
+++ b/tests/manual_tests/list_comments_by_update_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from test_base import run_test
 
 if __name__ == '__main__':