diff --git a/templates/Nextcloud-nfs/0/README.md b/templates/Nextcloud-nfs/0/README.md
deleted file mode 100644
index 5a626c5..0000000
--- a/templates/Nextcloud-nfs/0/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Nextcloud
\ No newline at end of file
diff --git a/templates/Nextcloud-nfs/0/docker-compose.yml b/templates/Nextcloud-nfs/0/docker-compose.yml
deleted file mode 100644
index c5b6a9c..0000000
--- a/templates/Nextcloud-nfs/0/docker-compose.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-version: '2'
-services:
-
-  nextcloud:
-    image: nextcloud:stable-apache
-    depends_on:
-      - mysql
-    dns:
-      - 1.1.1.1
-      - 1.0.0.1
-    environment:
-      MYSQL_HOST: mysql
-      MYSQL_DATABASE: nextcloud
-      MYSQL_USER: nextcloud_user
-      MYSQL_PASSWORD: ${DB_USER_PASS}
-      NEXTCLOUD_ADMIN_USER: ${NC_ADMIN}
-      NEXTCLOUD_ADMIN_PASSWORD: ${NC_ADMIN_PASS}
-    labels:
-      # io.rancher.container.hostname_override: container_name
-{{- if (.Values.HOST_LABEL)}}
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
-{{- end}}
-      traefik.enable: true
-      traefik.alias: cloudtest
-      traefik.domain: williammiceli.systems
-      traefik.port: 9000
-      traefik.acme: true
-      traefik.backend: Nextcloud
-      traefik.frontend.entryPoints: http,https
-      traefik.docker.network: public
-    networks:
-      - nextcloud-net
-      - public
-    ports:
-      - "${HOST_HTTP_PORT}:80"
-    restart: on-failure
-    volumes:
-      - nextcloud_app:/var/www/html
-      - nextcloud_data:/var/www/html/data
-
-  mysql:
-    image: mysql:5
-    dns:
-      - 1.1.1.1
-      - 1.0.0.1
-    environment:
-      MYSQL_DATABASE: nextcloud
-      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
-      MYSQL_USER: nextcloud_user
-      MYSQL_PASSWORD: ${DB_USER_PASS}
-    labels:
-{{- if (.Values.HOST_LABEL)}}
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
-{{- end}}
-    networks:
-      - nextcloud-net
-    restart: on-failure
-    volumes:
-      - nextcloud_db:/var/lib/mysql
-
-networks:
-  nextcloud-net:
-    driver: bridge
-  public:
-    external: true
-volumes:
-  nextcloud_app:
-    driver: rancher-nfs
-    driver_opts:
-      onRemove: retain
-  nextcloud_data:
-    driver: rancher-nfs
-    driver_opts:
-      onRemove: retain
-  nextcloud_db:
-    driver: rancher-nfs
-    driver_opts:
-      onRemove: retain
\ No newline at end of file
diff --git a/templates/Nextcloud-nfs/0/rancher-compose.yml b/templates/Nextcloud-nfs/0/rancher-compose.yml
deleted file mode 100644
index 46afb9c..0000000
--- a/templates/Nextcloud-nfs/0/rancher-compose.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-version: '2'
-catalog:
-  name: Nextcloud
-  version: latest
-  # description:
-  # minimum_rancher_version:
-  # maximum_rancher_version:
-  # upgrade_from:
-  questions:
-
-    - variable: HOST_LABEL
-      label: "Host Label Key/Value Pair"
-      description: |
-        The Label Key/Value pair on the host which containers should be deployed
-      default: "host.id=0000"
-      required: false
-      type: string
-
-    - variable: HOST_HTTP_PORT
-      label: Port
-      description: |
-        The HTTP port to access the web interface on.
-      default: "9000"
-      required: true
-      type: string
-
-    - variable: DB_ROOT_PASS
-      label: "MySQL Root Password"
-      description: |
-        A secure password to be used by the "root" MySQL user.
-      required: true
-      type: password
-
-    - variable: DB_USER_PASS
-      label: "MySQL User Password"
-      description: |
-        A secure password to be used by the "nextcloud_user" MySQL user.
-      required: true
-      type: password
-
-    - variable: NC_ADMIN
-      label: "Nextcloud Admin Username"
-      description: |
-        The username of the Nextcloud admin user.
-      required: true
-      type: string
-
-    - variable: NC_ADMIN_PASS
-      label: "Nextcloud Admin Password"
-      description: |
-        A secure password for the Nextcloud admin user.
-      required: true
-      type: password
-
-services:
-  nextcloud:
-    scale: 1
-  mysql:
-    scale: 1
\ No newline at end of file
diff --git a/templates/Nextcloud-nfs/config.yml b/templates/Nextcloud-nfs/config.yml
deleted file mode 100644
index 3e0f8be..0000000
--- a/templates/Nextcloud-nfs/config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Nextcloud
-description: |
-  Status: Functional
-version: latest
-# category:
-maintainer: WilliamMiceli
-# license:
-# projectURL: https://github.com/ellerbrock/rancher-collection
\ No newline at end of file
diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml
index 0d2fc96..c5b6a9c 100644
--- a/templates/Nextcloud/0/docker-compose.yml
+++ b/templates/Nextcloud/0/docker-compose.yml
@@ -35,8 +35,8 @@ services:
       - "${HOST_HTTP_PORT}:80"
     restart: on-failure
     volumes:
-      - ${STORAGE_BASE_DIR}${APP_DIR}:/var/www/html
-      - ${STORAGE_BASE_DIR}${DATA_DIR}:/var/www/html/data
+      - nextcloud_app:/var/www/html
+      - nextcloud_data:/var/www/html/data
 
   mysql:
     image: mysql:5
@@ -56,10 +56,23 @@ services:
       - nextcloud-net
     restart: on-failure
     volumes:
-      - ${STORAGE_BASE_DIR}${DB_DIR}:/var/lib/mysql
+      - nextcloud_db:/var/lib/mysql
 
 networks:
   nextcloud-net:
     driver: bridge
   public:
-    external: true
\ No newline at end of file
+    external: true
+volumes:
+  nextcloud_app:
+    driver: rancher-nfs
+    driver_opts:
+      onRemove: retain
+  nextcloud_data:
+    driver: rancher-nfs
+    driver_opts:
+      onRemove: retain
+  nextcloud_db:
+    driver: rancher-nfs
+    driver_opts:
+      onRemove: retain
\ No newline at end of file
diff --git a/templates/Nextcloud/0/rancher-compose.yml b/templates/Nextcloud/0/rancher-compose.yml
index 7adde99..46afb9c 100644
--- a/templates/Nextcloud/0/rancher-compose.yml
+++ b/templates/Nextcloud/0/rancher-compose.yml
@@ -24,38 +24,6 @@ catalog:
       required: true
       type: string
 
-    - variable: STORAGE_BASE_DIR
-      label: "Base Storage Directory"
-      description: |
-        The base path of where persistent storage should be kept at.
-      default: "/RancherStorage/Nextcloud"
-      required: true
-      type: string
-
-    - variable: APP_DIR
-      label: "Application Files Directory"
-      description: |
-        The folder for persistent logo files.
-      default: "/Application"
-      required: true
-      type: string
-
-    - variable: DATA_DIR
-      label: "User Data Directory"
-      description: |
-        The folder for persistent user data.
-      default: "/UserData"
-      required: true
-      type: string
-
-    - variable: DB_DIR
-      label: "Database Directory"
-      description: |
-        The folder for persistent database files.
-      default: "/Database"
-      required: true
-      type: string
-
     - variable: DB_ROOT_PASS
       label: "MySQL Root Password"
       description: |