diff --git a/nova/map.jinja b/nova/map.jinja
index b929b88..1883d7b 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -112,7 +112,7 @@
 }, merge=pillar.nova.get('controller', {}), base='BaseDefaults') %}
 
 {% set upgrade = pillar.get('nova', {}).get('upgrade', {}) %}
-{% set pin_level = 'auto' %}
+{% set pin_level = pillar.get('nova', {}).get('upgrade', {}).get('old_release','') %}
 
 {% set upgrade_levels = salt['grains.filter_by']({
     'Debian': {
@@ -283,7 +283,7 @@
 {% set compute = salt["grains.filter_by"](compute_defaults, merge=pillar.nova.get("compute", {}), base='BaseDefaults') %}
 
 {%- if pillar.nova.get('upgrade',{}).get('upgrade_enabled',False) %}
-  {% do compute.update(upgrade_levels) %}
+  {% do compute.update({'upgrade_levels': {'compute': 'auto'}}) %}
   {% do controller.update(upgrade_levels) %}
 {%- endif %}