diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile
index 54e4801e..1a511035 100644
--- a/10.0/apache/Dockerfile
+++ b/10.0/apache/Dockerfile
@@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/10.0/apache/apps.config.php b/10.0/apache/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/10.0/apache/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/10.0/apache/docker-entrypoint.sh b/10.0/apache/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/10.0/apache/docker-entrypoint.sh
+++ b/10.0/apache/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile
index 5f4c7e2d..6e014307 100644
--- a/10.0/fpm/Dockerfile
+++ b/10.0/fpm/Dockerfile
@@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/10.0/fpm/apps.config.php b/10.0/fpm/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/10.0/fpm/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/10.0/fpm/docker-entrypoint.sh b/10.0/fpm/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/10.0/fpm/docker-entrypoint.sh
+++ b/10.0/fpm/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index 5217f2e7..8fe705f6 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/11.0/apache/apps.config.php b/11.0/apache/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/11.0/apache/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/11.0/apache/docker-entrypoint.sh b/11.0/apache/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/11.0/apache/docker-entrypoint.sh
+++ b/11.0/apache/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index e703bcd1..c77129af 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/11.0/fpm/apps.config.php b/11.0/fpm/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/11.0/fpm/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/11.0/fpm/docker-entrypoint.sh b/11.0/fpm/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/11.0/fpm/docker-entrypoint.sh
+++ b/11.0/fpm/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/9.0/apache/Dockerfile b/9.0/apache/Dockerfile
index 432d60ba..d9bb364e 100644
--- a/9.0/apache/Dockerfile
+++ b/9.0/apache/Dockerfile
@@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/9.0/apache/apps.config.php b/9.0/apache/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/9.0/apache/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/9.0/apache/docker-entrypoint.sh b/9.0/apache/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/9.0/apache/docker-entrypoint.sh
+++ b/9.0/apache/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/9.0/fpm/Dockerfile b/9.0/fpm/Dockerfile
index 2bab08c1..2b60039a 100644
--- a/9.0/fpm/Dockerfile
+++ b/9.0/fpm/Dockerfile
@@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/9.0/fpm/apps.config.php b/9.0/fpm/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/9.0/fpm/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/9.0/fpm/docker-entrypoint.sh b/9.0/fpm/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/9.0/fpm/docker-entrypoint.sh
+++ b/9.0/fpm/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/Dockerfile-php7.template b/Dockerfile-php7.template
index afc62eac..fe282ad0 100644
--- a/Dockerfile-php7.template
+++ b/Dockerfile-php7.template
@@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["%%CMD%%"]
diff --git a/Dockerfile.template b/Dockerfile.template
index e03e8f1c..abfa9bc2 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
  && rm nextcloud.tar.bz2
 
 COPY docker-entrypoint.sh /entrypoint.sh
+COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["%%CMD%%"]
diff --git a/apps.config.php b/apps.config.php
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/apps.config.php
@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d747eadb..1d40304f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
     fi
 
-    mkdir -p /var/www/html/apps
-    for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
-        rm -rf /var/www/html/apps/$app
-        cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
-    done
+    mkdir -p /var/www/html/custom_apps
 
     chown -R www-data /var/www/html
 
diff --git a/update.sh b/update.sh
index 4c41d755..352820bf 100755
--- a/update.sh
+++ b/update.sh
@@ -46,6 +46,9 @@ for latest in "${latests[@]}"; do
 		# Copy the docker-entrypoint.
 		cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
 
+		# Copy apps.config.php
+		cp apps.config.php "$version/$variant/apps.config.php"
+
 		travisEnv='\n  - VERSION='"$version"' VARIANT='"$variant$travisEnv"
 	done
 done