diff --git a/erpnext/regional/address_template/templates/germany.html b/erpnext/regional/address_template/templates/germany.html
index 25c9c9d32e6e806eaccc15bfa1dde30b016fd3ba..3886bfadc0b2f90e8f6bdcee184cf2f80d95ecc6 100644
--- a/erpnext/regional/address_template/templates/germany.html
+++ b/erpnext/regional/address_template/templates/germany.html
@@ -1,8 +1,4 @@
 {{ address_line1 }}<br>
 {% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
-{% if country in ["Germany", "Deutschland"] %}
-    {{ pincode }} {{ city }}
-{% else %}
-    {{ pincode }} {{ city | upper }}<br>
-    {{ country | upper }}
-{% endif %}
+{{ pincode }} {{ city | upper }}<br>
+{{ country | upper }}
diff --git a/erpnext/regional/address_template/templates/switzerland.html b/erpnext/regional/address_template/templates/switzerland.html
new file mode 100644
index 0000000000000000000000000000000000000000..3886bfadc0b2f90e8f6bdcee184cf2f80d95ecc6
--- /dev/null
+++ b/erpnext/regional/address_template/templates/switzerland.html
@@ -0,0 +1,4 @@
+{{ address_line1 }}<br>
+{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+{{ pincode }} {{ city | upper }}<br>
+{{ country | upper }}