diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e9229f..8124a6b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
-        postgresql_version: [16, 17]
+        python_version: [3.12, 3.13, 3.14]
+        postgresql_version: [16, 17, 18]
         username_type: [email, username]
         use_drf: [y, n]
     steps:
diff --git a/.python-version b/.python-version
index e4fba21..6324d40 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.12
+3.14
diff --git a/django/cookiecutter.json b/django/cookiecutter.json
index 17cb836..a0f0106 100644
--- a/django/cookiecutter.json
+++ b/django/cookiecutter.json
@@ -3,12 +3,14 @@
   "project_slug": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_')|replace('.', '_')|trim() }}",
   "customer": "internal",
   "python_version": [
-    "3.12",
-    "3.13"
+    "3.14",
+    "3.13",
+    "3.12"
   ],
   "postgresql_version": [
-    "16",
-    "17"
+    "18",
+    "17",
+    "16"
   ],
   "username_type": [
     "email",
diff --git a/django/{{ cookiecutter.project_slug }}/.gitlab-ci.yml b/django/{{ cookiecutter.project_slug }}/.gitlab-ci.yml
index a298b1b..8a05871 100644
--- a/django/{{ cookiecutter.project_slug }}/.gitlab-ci.yml	
+++ b/django/{{ cookiecutter.project_slug }}/.gitlab-ci.yml	
@@ -5,7 +5,7 @@ stages:
 
 include:
   - local: .gitlab/ci/*.gitlab-ci.yml
-  - component: singular-code.de/singularit/ci-components/utilities/size/all@1.2.0
+  - component: $CI_SERVER_FQDN/singularit/ci-components/utilities/size/all@1.2.0
   - component: $CI_SERVER_FQDN/singularit/ci-components/security/dependency-audit/sbom@0.3.6
 
 variables:
diff --git a/django/{{ cookiecutter.project_slug }}/.gitlab/ci/test.gitlab-ci.yml b/django/{{ cookiecutter.project_slug }}/.gitlab/ci/test.gitlab-ci.yml
index f02d7c0..8718a92 100644
--- a/django/{{ cookiecutter.project_slug }}/.gitlab/ci/test.gitlab-ci.yml	
+++ b/django/{{ cookiecutter.project_slug }}/.gitlab/ci/test.gitlab-ci.yml	
@@ -17,7 +17,7 @@ deploy-check:
   stage: test
   interruptible: true
   allow_failure: true
-  image: orbisk/django-test:3.12
+  image: orbisk/django-test:{{ cookiecutter.python_version }}
   extends:
     - .size:medium
   variables:
diff --git a/django/{{ cookiecutter.project_slug }}/users/migrations/0001_initial.py b/django/{{ cookiecutter.project_slug }}/users/migrations/0001_initial.py
index e9bc576..09c331d 100644
--- a/django/{{ cookiecutter.project_slug }}/users/migrations/0001_initial.py	
+++ b/django/{{ cookiecutter.project_slug }}/users/migrations/0001_initial.py	
@@ -31,8 +31,9 @@ class Migration(migrations.Migration):
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
             ],
             options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
+                'ordering': {% if cookiecutter.username_type == "username" %}['username']{% else %}['email']{% endif %},
+                'verbose_name': 'User',
+                'verbose_name_plural': 'Users',
                 'abstract': False,
             },
         ),
diff --git a/django/{{ cookiecutter.project_slug }}/users/models.py b/django/{{ cookiecutter.project_slug }}/users/models.py
index 488df80..2c8711f 100644
--- a/django/{{ cookiecutter.project_slug }}/users/models.py	
+++ b/django/{{ cookiecutter.project_slug }}/users/models.py	
@@ -56,6 +56,7 @@ def __repr__(self):
     def __str__(self):
         return self.email
 {% else %}
+        ordering = ["username"]
 
     def __repr__(self):
         return f"User({self.username})"