diff --git a/TeamForge/settings.py b/TeamForge/settings.py
index 8924514..3744a0a 100644
--- a/TeamForge/settings.py
+++ b/TeamForge/settings.py
@@ -149,7 +149,6 @@ CONSTANCE_CONFIG = {
     "TF_DEFAULT_SEASON_MONTH": (config("TF_DEFAULT_SEASON_MONTH", default=8, cast=int), "Default season start month", int),
     "TF_DEFAULT_SEASON_DAY": (config("TF_DEFAULT_SEASON_DAY", default=1, cast=int), "Default season start day", int),
     "TF_DEFAULT_SEASON_DURATION": (config("TF_DEFAULT_SEASON_DURATION", default="1y", cast=str), "Default season duration", str),
-    "TF_ENABLE_TEAMS": (config("TF_ENABLE_TEAMS", default=True, cast=bool), "Enable teams", bool),
 }
 
 PHONENUMBER_DEFAULT_FORMAT = "INTERNATIONAL"
@@ -158,3 +157,4 @@ PHONENUMBER_DEFAULT_REGION = config("CM_CLUB_COUNTRY_CODE", default="BE", cast=s
 TAILWIND_APP_NAME = "theme"
 
 WAFFLE_CREATE_MISSING_FLAGS = True
+WAFFLE_CREATE_MISSING_SWITCHES = True
diff --git a/backend/members/views.py b/backend/members/views.py
index 3d22e6f..0a42ceb 100644
--- a/backend/members/views.py
+++ b/backend/members/views.py
@@ -124,7 +124,7 @@ class MemberLoadView(PermissionRequiredMixin, HTMXViewMixin, SuccessMessageMixin
     partial_name = "members/member_load.html#content"
     menu_highlight = "members"
     template_name = "members/member_load.html"
-    waffle_flag = "mass_upload"
+    waffle_flag = "TF_MASS_UPLOAD"
 
     def handle_no_permission(self) -> HttpResponseRedirect:
         messages.error(self.request, self.get_permission_denied_message())
diff --git a/templates/members/member_filter.html b/templates/members/member_filter.html
index 8e22c73..2135480 100644
--- a/templates/members/member_filter.html
+++ b/templates/members/member_filter.html
@@ -60,7 +60,7 @@
             </div>
 
             <div class="add">
-                {% flag "mass_upload" %}
+                {% flag "TF_MASS_UPLOAD" %}
                     <a class="btn btn-accent btn-sm grow hidden lg:flex" href="{% url "backend:members:load" %}" hx-get="{% url "backend:members:load" %}" hx-target="#content">
                         <i class="fa-solid fa-file-upload"></i>{% translate "Load members from file" %}
                     </a>
diff --git a/templates/members/member_form.html b/templates/members/member_form.html
index e08a934..a30c402 100644
--- a/templates/members/member_form.html
+++ b/templates/members/member_form.html
@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load form_field %}
 {% load avatar %}
+{% load waffle_tags %}
 
 {% block content %}
     {% partialdef content inline %}
@@ -51,11 +52,11 @@
                 {% endif %}
             </div>
 
-            {% if config.TF_ENABLE_TEAMS %}
+            {% switch "TF_ENABLE_TEAMS" %}
                 <a href="?member__user__first_name={{ member.user.first_name }}&member__user__last_name={{ member.user.last_name }}" class="btn btn-sm w-full mt-2 btn-outline btn-neutral lg:hidden">
                     <i class="fa-solid fa-ticket"></i>{% translate "View team memberships" %}
                 </a>
-            {% endif %}
+            {% endswitch %}
 
             <div class="hidden flex-row items-center mt-8 gap-x-3 hidden lg:flex">
                 {% avatar first_name=member.user.first_name last_name=member.user.last_name %}
@@ -75,11 +76,11 @@
                         <a href="{{ member.emergency_phone_number.as_rfc3966 }}" class="btn btn-outline btn-error"><i class="fa-solid fa-star-of-life"></i>{{ member.emergency_phone_number }}</a>
                     {% endif %}
 
-                    {% if config.TF_ENABLE_TEAMS %}
+                    {% switch "TF_ENABLE_TEAMS" %}
                         <a href="?member__user__first_name={{ member.user.first_name }}&member__user__last_name={{ member.user.last_name }}" class="btn btn-outline btn-neutral">
                             <i class="fa-solid fa-ticket"></i>{% translate "Team Memberships" %}
                         </a>
-                    {% endif %}
+                    {% endswitch %}
 
                     <a href="{% url "backend:members:delete" member.pk %}" class="btn btn-error btn-outline" hx-get="{% url "backend:members:delete" member.pk %}" hx-target="#content">
                         <i class="fa-solid fa-trash"></i>{% translate "Delete" %}