diff --git a/roles/gitea/templates/.env.gitea.j2 b/roles/gitea/templates/.env.gitea.j2
index 266ca3d..7752c11 100644
--- a/roles/gitea/templates/.env.gitea.j2
+++ b/roles/gitea/templates/.env.gitea.j2
@@ -23,3 +23,6 @@ GITEA__security__SECRET_KEY="{{ secret_key }}"
 GITEA__security__INTERNAL_TOKEN="{{ internal_token }}"
 
 GITEA__oauth2__JWT_SECRET="{{ jwt_secret }}"
+
+# Indexer
+GITEA__indexer__REPO_INDEXER_ENABLED=true
diff --git a/roles/nextcloud/templates/.env.j2 b/roles/nextcloud/templates/.env.j2
new file mode 100644
index 0000000..c53710c
--- /dev/null
+++ b/roles/nextcloud/templates/.env.j2
@@ -0,0 +1 @@
+NEXTCLOUD_VERSION=25-fpm-alpine
diff --git a/roles/nextcloud/templates/docker-compose.yml.j2 b/roles/nextcloud/templates/docker-compose.yml.j2
index 140cf18..de4cc9c 100644
--- a/roles/nextcloud/templates/docker-compose.yml.j2
+++ b/roles/nextcloud/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@ volumes:
 
 services:
   app:
-    image: nextcloud:24-fpm-alpine
+    image: nextcloud:${NEXTCLOUD_VERSION}
     container_name: nextcloud_app
     restart: unless-stopped
     depends_on:
@@ -29,7 +29,7 @@ services:
       - nextcloud_data:/var/www/html/data
 
   cron:
-    image: nextcloud:24-fpm-alpine
+    image: nextcloud:${NEXTCLOUD_VERSION}
     container_name: nextcloud_cron
     restart: unless-stopped
     depends_on:
@@ -41,7 +41,7 @@ services:
       - app
 
   notify_push:
-    image: nextcloud:24-fpm-alpine
+    image: nextcloud:${NEXTCLOUD_VERSION}
     container_name: nextcloud_notify_push
     restart: unless-stopped
     depends_on: