diff --git a/nextcloud.yml b/nextcloud.yml
index 90685df..cbd29a0 100644
--- a/nextcloud.yml
+++ b/nextcloud.yml
@@ -6,6 +6,9 @@
       password_salt: "{{ nextcloud.password_salt }}"
       secret: "{{ nextcloud.secret }}"
       db_password: "{{ postgresql_users.nextcloud }}"
+      mail_domain: comfycamp.space
+      smtp_host: comfycamp.space
+      smtp_name: nextcloud@comfycamp.space
       smtp_password: "{{ mail_users['nextcloud@comfycamp.space'] }}"
       url: https://nc.comfycamp.space
       trusted_domains: ["nc.comfycamp.space"]
diff --git a/roles/nextcloud/meta/argument_specs.yml b/roles/nextcloud/meta/argument_specs.yml
index 37fd5b6..7ff5ad4 100644
--- a/roles/nextcloud/meta/argument_specs.yml
+++ b/roles/nextcloud/meta/argument_specs.yml
@@ -2,6 +2,10 @@
 argument_specs:
   main:
     options:
+      version:
+        type: str
+      overwrite_protocol:
+        type: str
       instance_id:
         type: str
         required: true
@@ -23,9 +27,28 @@ argument_specs:
         elements: str
         required: true
         description: "example.com"
+      db_type:
+        type: str
+      db_name:
+        type: str
+      db_host:
+        type: str
+      db_port:
+        type: int
+      db_user:
+        type: str
       db_password:
         type: str
-        required: true
+      mail_from_address:
+        type: str
+      mail_domain:
+        type: str
+      smtp_host:
+        type: str
+      smtp_port:
+        type: int
+      smtp_name:
+        type: str
       smtp_password:
         type: str
         required: true
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 1efd100..09b0300 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -24,7 +24,7 @@
   become: true
   community.docker.docker_container:
     name: nextcloud-{{ item }}
-    image: nextcloud:{{ version }}-apache
+    image: nextcloud:30.0.1-apache
     networks:
       - name: nextcloud
       - name: haproxy
diff --git a/roles/nextcloud/templates/config.php.j2 b/roles/nextcloud/templates/config.php.j2
index 7e6d0a0..810aed2 100644
--- a/roles/nextcloud/templates/config.php.j2
+++ b/roles/nextcloud/templates/config.php.j2
@@ -4,7 +4,7 @@ $CONFIG = array (
   'instanceid' => '{{ instance_id }}',
   'passwordsalt' => '{{ password_salt }}',
   'secret' => '{{ secret }}',
-  'version' => '{{ full_version }}',
+  'version' => '{{ version }}',
   'dbtype' => '{{ db_type }}',
   'overwrite.cli.url' => '{{ url }}',
   'overwriteprotocol' => '{{ overwrite_protocol }}',
diff --git a/roles/nextcloud/vars/main.yml b/roles/nextcloud/vars/main.yml
index da85c9f..7640df4 100644
--- a/roles/nextcloud/vars/main.yml
+++ b/roles/nextcloud/vars/main.yml
@@ -1,5 +1,4 @@
-version: 30.0.1
-full_version: 30.0.1.2
+version: 30.0.1.2
 overwrite_protocol: https
 
 db_type: pgsql
@@ -9,10 +8,10 @@ db_port: 5432
 db_user: nextcloud
 
 mail_from_address: nextcloud
-mail_domain: comfycamp.space
-smtp_host: comfycamp.space
+mail_domain: ""
+smtp_host: ""
 smtp_port: 587
-smtp_name: nextcloud@comfycamp.space
+smtp_name: ""
 
 redis_host: nextcloud-redis
 redis_port: 6379