diff --git a/dappnode_package.json b/dappnode_package.json
index 95868a7..ddfff44 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -2,12 +2,17 @@
   "name": "nextcloud.dnp.dappnode.eth",
   "version": "0.1.0",
   "upstream": [
-    {
-      "repo": "nextcloud/server",
-      "version": "v34.0.0rc1",
-      "arg": "UPSTREAM_VERSION"
-    }
-  ],
+  {
+    "repo": "nextcloud/server",
+    "arg": "NEXTCLOUD_VERSION"
+  },
+  {
+    "repo": "redis/redis",
+    "arg": "REDIS_VERSION",
+    "release": "tag",
+    "filter": "^[0-9]+\\.[0-9]+\\.[0-9]+$"
+  }
+],
   "shortDescription": "Self-hosted cloud storage and collaboration platform",
   "description": "Nextcloud gives you access to all your files wherever you are. Run your own cloud storage, calendar, contacts, and office suite on your DAppNode — fully self-hosted and private.\n\nThis package includes Nextcloud with MariaDB and Redis for optimal performance.\n\n**Features:**\n- File sync and sharing across all your devices\n- Calendar, contacts, and task management\n- Collaborative document editing\n- Photo and media management\n- MariaDB database for reliability\n- Redis caching for fast performance\n\n**First run:** Visit the Nextcloud UI link below to complete the setup wizard and create your admin account.\n\nAccess Nextcloud at http://nextcloud.dappnode:8034",
   "type": "service",
diff --git a/docker-compose.yml b/docker-compose.yml
index bac35bb..550c92f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: nextcloud
       args:
-        UPSTREAM_VERSION: v34.0.0rc1
+        - NEXTCLOUD_VERSION
     container_name: nextcloud.nextcloud.dnp.dappnode.eth
     volumes:
       - nextcloud-data:/var/www/html
@@ -41,7 +41,7 @@ services:
     build:
       context: redis
       args:
-        UPSTREAM_VERSION: v34.0.0rc1
+        - REDIS_VERSION
     container_name: redis.nextcloud.dnp.dappnode.eth
     volumes:
       - redis-data:/data
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 2be1cc0..d49d490 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,5 +1,5 @@
-ARG UPSTREAM_VERSION
-FROM nextcloud:${UPSTREAM_VERSION}
+ARG NEXTCLOUD_VERSION
+FROM nextcloud:${NEXTCLOUD_VERSION}
 
 # Configure Apache to listen on port 8034 instead of 80
 RUN sed -i 's/Listen 80/Listen 8034/' /etc/apache2/ports.conf && \
diff --git a/redis/Dockerfile b/redis/Dockerfile
index bfd61de..c4ac182 100644
--- a/redis/Dockerfile
+++ b/redis/Dockerfile
@@ -1,2 +1,2 @@
-ARG UPSTREAM_VERSION
-FROM redis:${UPSTREAM_VERSION}
+ARG REDIS_VERSION
+FROM redis:${REDIS_VERSION}-alpine