diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 331bd7e..ba6e150 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -132,6 +132,7 @@
                 type: string
                 default: "{{stack_cleanup_job}}"
               # salt
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 7bffaf2..0088fbd 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -55,6 +55,7 @@
               type: boolean
               default: 'false'
               description: "Enable it when stack have to be deleted."
+            # FIXME allign to DISTRIB_REVISION
             FORMULA_PKG_REVISION:
               type: string
               description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index c082306..650e1de 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -70,6 +70,7 @@
                 type: text
                 default: ""
                 description: YAML with overrides for Salt deployment
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 73f815d..c768fb4 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -26,14 +26,15 @@
               # Cookiecutter
               COOKIECUTTER_TEMPLATE_CONTEXT:
                 type: text
-
               # Other
               EMAIL_ADDRESS:
                 type: string
               TEST_MODEL:
                 type: boolean
                 default: true
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of Reclass we will use.pip+git package"
+                default: 'proposed'
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
+
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index c6c54bb..296934e 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -51,9 +51,6 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
-                type: string
-                default: "{{formulas_revision}}"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -63,9 +60,9 @@
               CONFIG_NODE_NAME_PATTERN:
                 type: string
                 default: "{{config_node_name}}"
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: "master"
+                default: "{{distrib_revision}}"
               MAX_CPU_PER_JOB:
                 type: string
                 default: "2"
@@ -157,9 +154,11 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
+              DISTRIB_REVISION:
                 type: string
-                default: "{{formulas_revision}}"
+                default: "{{distrib_revision}}"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -175,10 +174,6 @@
               RECLASS_IGNORE_CLASS_NOTFOUND:
                 type: boolean
                 default: "{{reclass_ignore_class_notfound}}"
-              RECLASS_VERSION:
-                type: string
-                default: "master"
-                description: "Version (branch) of Reclass we will use"
               LEGACY_TEST_MODE:
                 type: boolean
                 default: "{{legacy_test_mode}}"
@@ -290,11 +285,8 @@
               DISTRIB_REVISION:
                 type: string
                 default: 'nightly'
-                description: "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env"
-              RECLASS_VERSION:
-                type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of reclass PACKAGE we will use"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               CREDENTIALS_ID:
                 type: string
                 default: gerrit
@@ -343,23 +335,17 @@
             FORMULAS_SOURCE:
               type: string
               default: "pkg"
-            FORMULAS_REVISION:
-              type: string
-              default: "stable"
             SYSTEM_GIT_URL:
               type: string
               default: ""
             SYSTEM_GIT_REF:
               type: string
               default: ""
-            RECLASS_VERSION:
+            DISTRIB_REVISION:
               type: string
-              # In our repos the latest reclass we using is 1.4.1. The new version 1.5.2 is not compatible
-              # by syntax with 1.4.1 more details may be found here PROD-20425.
-              # Run rendering tests against version we using on customer side, until new version of reclass is
-              # packaged and placed to our repos, so we can do smooth transition to new syntax.
-              default: "reclass-1.4.1"
-              description: "Version (branch) of Reclass we will use"
+              default: 'stable'
+              description: |-
+                  "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
             MAX_CPU_PER_JOB:
               type: string
               default: "2"