diff --git a/Makefile b/Makefile
index 0227bab172..e773eeb1d6 100644
--- a/Makefile
+++ b/Makefile
@@ -316,7 +316,8 @@ requirements: virtualenv .sdist-requirements
 	$(VIRTUALENV_DIR)/bin/pip install --upgrade "virtualenv==15.1.0" # Required for packs.install in dev envs.
 
 	# Generate all requirements to support current CI pipeline.
-	$(VIRTUALENV_DIR)/bin/python scripts/fixate-requirements.py --skip=virtualenv -s st2*/in-requirements.txt contrib/runners/*/in-requirements.txt -f fixed-requirements.txt -o requirements.txt
+	# NOTE: We exclude st2common from final combined requirements.txt
+	$(VIRTUALENV_DIR)/bin/python scripts/fixate-requirements.py --skip=virtualenv,st2common -s st2*/in-requirements.txt contrib/runners/*/in-requirements.txt -f fixed-requirements.txt -o requirements.txt
 
 	# Generate finall requirements.txt file for each component
 	@for component in $(COMPONENTS_WITH_RUNNERS); do\
diff --git a/contrib/runners/action_chain_runner/in-requirements.txt b/contrib/runners/action_chain_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/action_chain_runner/in-requirements.txt
+++ b/contrib/runners/action_chain_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/action_chain_runner/requirements.txt b/contrib/runners/action_chain_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/action_chain_runner/requirements.txt
+++ b/contrib/runners/action_chain_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/action_chain_runner/setup.py b/contrib/runners/action_chain_runner/setup.py
index c6fa0c1476..75e590d1e2 100644
--- a/contrib/runners/action_chain_runner/setup.py
+++ b/contrib/runners/action_chain_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-action-chain',
-    version='2.5.0',
+    version=__version__,
     description=('Action-Chain workflow action runner for StackStorm event-driven '
                  'automation platform'),
     author='StackStorm',
diff --git a/contrib/runners/announcement_runner/in-requirements.txt b/contrib/runners/announcement_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/announcement_runner/in-requirements.txt
+++ b/contrib/runners/announcement_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/announcement_runner/requirements.txt b/contrib/runners/announcement_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/announcement_runner/requirements.txt
+++ b/contrib/runners/announcement_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/announcement_runner/setup.py b/contrib/runners/announcement_runner/setup.py
index 3291a7bff9..f7f4a0b85d 100644
--- a/contrib/runners/announcement_runner/setup.py
+++ b/contrib/runners/announcement_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-announcement',
-    version='2.5.0',
+    version=__version__,
     description=('Announcement action runner for StackStorm event-driven automation platform'),
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/cloudslang_runner/in-requirements.txt b/contrib/runners/cloudslang_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/cloudslang_runner/in-requirements.txt
+++ b/contrib/runners/cloudslang_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/cloudslang_runner/requirements.txt b/contrib/runners/cloudslang_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/cloudslang_runner/requirements.txt
+++ b/contrib/runners/cloudslang_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/cloudslang_runner/setup.py b/contrib/runners/cloudslang_runner/setup.py
index dda969d9b2..6071ea5e0e 100644
--- a/contrib/runners/cloudslang_runner/setup.py
+++ b/contrib/runners/cloudslang_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-cloudslang',
-    version='2.5.0',
+    version=__version__,
     description=('CloudSlang action runner for StackStorm event-driven automation platform'),
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/http_runner/in-requirements.txt b/contrib/runners/http_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/http_runner/in-requirements.txt
+++ b/contrib/runners/http_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/http_runner/requirements.txt b/contrib/runners/http_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/http_runner/requirements.txt
+++ b/contrib/runners/http_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/http_runner/setup.py b/contrib/runners/http_runner/setup.py
index b090e2412f..8e713fca94 100644
--- a/contrib/runners/http_runner/setup.py
+++ b/contrib/runners/http_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-http',
-    version='2.5.0',
+    version=__version__,
     description=('HTTP(s) action runner for StackStorm event-driven automation platform'),
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/inquirer_runner/in-requirements.txt b/contrib/runners/inquirer_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/inquirer_runner/in-requirements.txt
+++ b/contrib/runners/inquirer_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/inquirer_runner/requirements.txt b/contrib/runners/inquirer_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/inquirer_runner/requirements.txt
+++ b/contrib/runners/inquirer_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/inquirer_runner/setup.py b/contrib/runners/inquirer_runner/setup.py
index ffaf09e1ff..84bbea84d6 100644
--- a/contrib/runners/inquirer_runner/setup.py
+++ b/contrib/runners/inquirer_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-inquirer',
-    version='2.5.0',
+    version=__version__,
     description=('Inquirer action runner for StackStorm event-driven automation platform'),
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/local_runner/in-requirements.txt b/contrib/runners/local_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/local_runner/in-requirements.txt
+++ b/contrib/runners/local_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/local_runner/requirements.txt b/contrib/runners/local_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/local_runner/requirements.txt
+++ b/contrib/runners/local_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/local_runner/setup.py b/contrib/runners/local_runner/setup.py
index de75e32fcb..25c12c09c4 100644
--- a/contrib/runners/local_runner/setup.py
+++ b/contrib/runners/local_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-local',
-    version='2.5.0',
+    version=__version__,
     description=('Local Shell Command and Script action runner for StackStorm event-driven '
                  'automation platform'),
     author='StackStorm',
diff --git a/contrib/runners/mistral_v2/in-requirements.txt b/contrib/runners/mistral_v2/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/mistral_v2/in-requirements.txt
+++ b/contrib/runners/mistral_v2/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/mistral_v2/requirements.txt b/contrib/runners/mistral_v2/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/mistral_v2/requirements.txt
+++ b/contrib/runners/mistral_v2/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/mistral_v2/setup.py b/contrib/runners/mistral_v2/setup.py
index f75639d891..33dd2c7499 100644
--- a/contrib/runners/mistral_v2/setup.py
+++ b/contrib/runners/mistral_v2/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-mistral-v2',
-    version='2.5.0',
+    version=__version__,
     description=('Mistral v2 workflow action runner for StackStorm event-driven '
                  'automation platform'),
     author='StackStorm',
diff --git a/contrib/runners/noop_runner/in-requirements.txt b/contrib/runners/noop_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/noop_runner/in-requirements.txt
+++ b/contrib/runners/noop_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/noop_runner/requirements.txt b/contrib/runners/noop_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/noop_runner/requirements.txt
+++ b/contrib/runners/noop_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/noop_runner/setup.py b/contrib/runners/noop_runner/setup.py
index 80bb59d2e4..42f9a34830 100644
--- a/contrib/runners/noop_runner/setup.py
+++ b/contrib/runners/noop_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-noop',
-    version='2.5.0',
+    version=__version__,
     description=('No-Op action runner for StackStorm event-driven automation platform'),
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/orchestra_runner/in-requirements.txt b/contrib/runners/orchestra_runner/in-requirements.txt
index 236a1e3040..4e542ad146 100644
--- a/contrib/runners/orchestra_runner/in-requirements.txt
+++ b/contrib/runners/orchestra_runner/in-requirements.txt
@@ -1 +1,2 @@
 git+https://github.com/StackStorm/orchestra.git#egg=orchestra
+st2common
diff --git a/contrib/runners/orchestra_runner/requirements.txt b/contrib/runners/orchestra_runner/requirements.txt
index 5aa11564d7..85c843e4f1 100644
--- a/contrib/runners/orchestra_runner/requirements.txt
+++ b/contrib/runners/orchestra_runner/requirements.txt
@@ -1,2 +1,3 @@
 # Don't edit this file. It's generated automatically!
 git+https://github.com/StackStorm/orchestra.git#egg=orchestra
+st2common
diff --git a/contrib/runners/orchestra_runner/setup.py b/contrib/runners/orchestra_runner/setup.py
index ef48ee58bc..185386b4ee 100644
--- a/contrib/runners/orchestra_runner/setup.py
+++ b/contrib/runners/orchestra_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-orchestra',
-    version='2.5.0',
+    version=__version__,
     description='Orchestra workflow runner for StackStorm event-driven automation platform',
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/python_runner/in-requirements.txt b/contrib/runners/python_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/python_runner/in-requirements.txt
+++ b/contrib/runners/python_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/python_runner/requirements.txt b/contrib/runners/python_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/python_runner/requirements.txt
+++ b/contrib/runners/python_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/python_runner/setup.py b/contrib/runners/python_runner/setup.py
index a1cc22be1d..1617f9e746 100644
--- a/contrib/runners/python_runner/setup.py
+++ b/contrib/runners/python_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-python',
-    version='2.5.0',
+    version=__version__,
     description='Python action runner for StackStorm event-driven automation platform',
     author='StackStorm',
     author_email='info@stackstorm.com',
diff --git a/contrib/runners/remote_runner/in-requirements.txt b/contrib/runners/remote_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/remote_runner/in-requirements.txt
+++ b/contrib/runners/remote_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/remote_runner/requirements.txt b/contrib/runners/remote_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/remote_runner/requirements.txt
+++ b/contrib/runners/remote_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/remote_runner/setup.py b/contrib/runners/remote_runner/setup.py
index 39415094da..aa9ca21ea4 100644
--- a/contrib/runners/remote_runner/setup.py
+++ b/contrib/runners/remote_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-remote',
-    version='2.5.0',
+    version=__version__,
     description=('Remote SSH shell command and script action runner for StackStorm event-driven '
                  'automation platform'),
     author='StackStorm',
diff --git a/contrib/runners/windows_runner/in-requirements.txt b/contrib/runners/windows_runner/in-requirements.txt
index e69de29bb2..fd8240d108 100644
--- a/contrib/runners/windows_runner/in-requirements.txt
+++ b/contrib/runners/windows_runner/in-requirements.txt
@@ -0,0 +1 @@
+st2common
diff --git a/contrib/runners/windows_runner/requirements.txt b/contrib/runners/windows_runner/requirements.txt
index b4be240ac2..f632e5ff17 100644
--- a/contrib/runners/windows_runner/requirements.txt
+++ b/contrib/runners/windows_runner/requirements.txt
@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-
+st2common
diff --git a/contrib/runners/windows_runner/setup.py b/contrib/runners/windows_runner/setup.py
index d6516075e7..3130a101e9 100644
--- a/contrib/runners/windows_runner/setup.py
+++ b/contrib/runners/windows_runner/setup.py
@@ -23,6 +23,8 @@
 from dist_utils import fetch_requirements
 from dist_utils import apply_vagrant_workaround
 
+from st2common import __version__
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
 
@@ -31,7 +33,7 @@
 apply_vagrant_workaround()
 setup(
     name='stackstorm-runner-windows',
-    version='2.5.0',
+    version=__version__,
     description=('Windows command and script action runner for StackStorm event-driven '
                  'automation platform'),
     author='StackStorm',
diff --git a/contrib/runners/winrm_runner/in-requirements.txt b/contrib/runners/winrm_runner/in-requirements.txt
index 17a16ff26d..1aa3e996c1 100644
--- a/contrib/runners/winrm_runner/in-requirements.txt
+++ b/contrib/runners/winrm_runner/in-requirements.txt
@@ -1 +1,2 @@
 pywinrm
+st2common
diff --git a/contrib/runners/winrm_runner/requirements.txt b/contrib/runners/winrm_runner/requirements.txt
index 8fa65d3a82..5e8e6ba699 100644
--- a/contrib/runners/winrm_runner/requirements.txt
+++ b/contrib/runners/winrm_runner/requirements.txt
@@ -1,2 +1,3 @@
 # Don't edit this file. It's generated automatically!
 pywinrm==0.3.0
+st2common