diff --git a/src/servala/frontend/templates/frontend/base.html b/src/servala/frontend/templates/frontend/base.html
index f738a52..540a088 100644
--- a/src/servala/frontend/templates/frontend/base.html
+++ b/src/servala/frontend/templates/frontend/base.html
@@ -65,8 +65,6 @@
                         <div class="float-end">
                             <p>
                                 Crafted with <span class="text-danger"><i class="bi bi-heart-fill icon-mid"></i></span> in Zurich
-                                {% load version_tags %}
-                                - {% get_version_or_env %}
                             </p>
                         </div>
                     </div>
diff --git a/src/servala/frontend/templates/frontend/organizations/dashboard.html b/src/servala/frontend/templates/frontend/organizations/dashboard.html
index b58b720..01faa69 100644
--- a/src/servala/frontend/templates/frontend/organizations/dashboard.html
+++ b/src/servala/frontend/templates/frontend/organizations/dashboard.html
@@ -1,7 +1,7 @@
 {% extends "frontend/base.html" %}
 {% load i18n static %}
 {% block html_title %}
-    {% translate "Dashboard" %} for {{ object.name }}
+    {{ object.name }} {% translate "Dashboard" %}
 {% endblock html_title %}
 {% block page_title %}{% endblock %}
 {% block content %}
diff --git a/src/servala/frontend/templatetags/version_tags.py b/src/servala/frontend/templatetags/version_tags.py
deleted file mode 100644
index 249ecee..0000000
--- a/src/servala/frontend/templatetags/version_tags.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-from django import template
-from servala.__about__ import __version__
-
-register = template.Library()
-
-
-@register.simple_tag
-def get_version_or_env():
-    """Return version number in production, environment name otherwise."""
-    env = os.environ.get('SERVALA_ENVIRONMENT', 'development')
-    if env == 'production':
-        return __version__
-    return env