diff --git a/nova/map.jinja b/nova/map.jinja
index 49586d6..cd59c5b 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -114,23 +114,10 @@
 {% set upgrade = pillar.get('nova', {}).get('upgrade', {}) %}
 {% set pin_level = pillar.get('nova', {}).get('upgrade', {}).get('old_release','') %}
 
-{% if pin_level == "ocata" %}
+{% if pin_level not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata"] %}
 {% set upgrade_levels = {
     'upgrade_levels': {
-      'scheduler': pin_level,
-      'compute': pin_level,
-      'cells': pin_level,
-      'network': pin_level,
-      'console': pin_level,
-      'consoleauth': pin_level,
-      'conductor': pin_level,
-    },
-} %}
-{% elif pin_level == "pike" %}
-{% set upgrade_levels = {
-    'upgrade_levels': {
-      'scheduler': pin_level,
-      'compute': pin_level,
+      'compute': 'auto',
     },
 } %}
 {% else%}
@@ -281,7 +268,7 @@
 {% set compute = salt["grains.filter_by"](compute_defaults, merge=pillar.nova.get("compute", {}), base='BaseDefaults') %}
 
 {%- if pillar.nova.get('upgrade',{}).get('enabled',False) %}
-  {% do compute.update({'upgrade_levels': {'compute': 'auto'}}) %}
+  {% do compute.update(upgrade_levels) %}
   {% do controller.update(upgrade_levels) %}
 {%- endif %}