diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
index 9e70480..909da66 100644
--- a/horizon/server/plugin/heat.yml
+++ b/horizon/server/plugin/heat.yml
@@ -5,7 +5,9 @@
         heat:
           source:
             engine: pkg
-            name: openstack-dashboard-heat-server-templates
-        horizon_overrides:
-          overrides:
-          - heat_server_templates
+            name: python-heat-dashboard
+      policy:
+        orchestration:
+          enabled: true
+          name: heat_policy.json
+          source: file
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index be2326b..a85342d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -148,6 +148,10 @@
                 type: boolean
                 description: Whether to use container with rally
                 default: "{{use_rally}}"
+              TEST_MILESTONE:
+                type: string
+                description: Product milestone
+                default: ""
         test-openstack-component-periodic:
           name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
           template: