diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.18.desktop
similarity index 83%
rename from profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.18.desktop
index 37a764794..416d605a5 100644
--- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
+++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.18.desktop
@@ -1,4 +1,4 @@
-# Calculate format=kde link=/usr/share/applications/gnome-calculator.desktop name=calculate-calculator.desktop mirror pkg(gnome-extra/gnome-calculator)>=3.18
+# Calculate format=kde link=/usr/share/applications/gnome-calculator.desktop name=calculate-calculator.desktop mirror pkg(gnome-extra/gnome-calculator)=>3.18,3.36
 
 # Hide icon
 [Desktop Entry]
diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.36.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.36.desktop
new file mode 100644
index 000000000..f87d24f32
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator-3.36.desktop
@@ -0,0 +1,6 @@
+# Calculate format=kde link=/usr/share/applications/org.gnome.Calculator.desktop name=calculate-calculator.desktop mirror pkg(gnome-extra/gnome-calculator)>=3.36
+
+# Hide icon
+[Desktop Entry]
+NoDisplay=true
+!MimeType=