diff --git a/gencode-remote b/gencode-remote
index f59afda..6bac325 100755
--- a/gencode-remote
+++ b/gencode-remote
@@ -31,7 +31,7 @@ then
     echo "Missing nextcloud version (parameter/version)" >&2
     exit 1
 fi
-nextcloud_uri="${nextcloud_url}${nextcloud_version}.tar.bz2"
+nextcloud_uri="${nextcloud_url}-${nextcloud_version}.tar.bz2"
 # Download tar ball extract and apply script
 # TODO: verify shasum of tar ball
 curl -LO ${nextcloud_uri} -o ${nextcloud_dir}/nextcloud.tar.bz2
diff --git a/manifest b/manifest
index 367f0cc..7eca56c 100755
--- a/manifest
+++ b/manifest
@@ -28,11 +28,11 @@ for package in php7.0 php7.0-gd php7.0-json php7.0-pgsql php7.0-curl php7.0-mbst
 done
 
 # Nginx
-require="__package nginx" __file /etc/nginx/sites-enabled/nextcloud --owner www-data \
+require="__package/nginx" __file /etc/nginx/sites-enabled/nextcloud --owner www-data \
     --group www-data \
     --mode 755 --source "$__type/files/nextcloud.nginx" \
     --state exists
 
 # Postgres
-require="__package postgresql" __postgres_database nextcloud --owner nextcloud
+require="__package/postgresql" __postgres_database nextcloud --owner nextcloud
 require="__package/postgresql" __start_on_boot postgres