diff --git a/dd-ctl b/dd-ctl
index 42cde0a..fb31b57 100755
--- a/dd-ctl
+++ b/dd-ctl
@@ -362,14 +362,6 @@ setup_nextcloud(){
 		install -m 0644 -o 82 -g 82 "dd-apps/docker/nextcloud/nc_mail/$f" "${SRC_FOLDER}/nextcloud/custom_apps/mail/$f"
 	done
 
-	# Custom forms
-	docker exec dd-apps-nextcloud-app apk add git npm composer
-	docker exec -u www-data dd-apps-nextcloud-app rm -rf /var/www/html/custom_apps/forms
-	docker exec -u www-data dd-apps-nextcloud-app git clone https://github.com/juanan3ip/form -b dev /var/www/html/custom_apps/forms
-	docker exec -u www-data dd-apps-nextcloud-app npm --prefix /var/www/html/custom_apps/forms install
-	docker exec -u www-data dd-apps-nextcloud-app composer -d/var/www/html/custom_apps/forms install --no-dev -o
-	docker exec -u www-data dd-apps-nextcloud-app php occ app:enable forms
-
 	# Disable Big Blue Button media check by default
 	docker exec -u www-data dd-apps-nextcloud-app php occ config:app:set bbb join.mediaCheck --value="false"
 	# Disable Big Blue Button listen only mode by default
@@ -477,6 +469,16 @@ setup_nextcloud(){
 
 	configure_nextcloud_logo
 
+	# Custom forms
+	## This has forced the need for occ upgrade in the past
+	## Keep it towards the end
+	docker exec dd-apps-nextcloud-app apk add git npm composer
+	docker exec -u www-data dd-apps-nextcloud-app rm -rf /var/www/html/custom_apps/forms
+	docker exec -u www-data dd-apps-nextcloud-app git clone https://github.com/juanan3ip/form -b dev /var/www/html/custom_apps/forms
+	docker exec -u www-data dd-apps-nextcloud-app npm --prefix /var/www/html/custom_apps/forms install
+	docker exec -u www-data dd-apps-nextcloud-app composer -d/var/www/html/custom_apps/forms install --no-dev -o
+	docker exec -u www-data dd-apps-nextcloud-app php occ app:enable forms
+
 	nextcloud_upgrade
 }