diff --git a/catalogue-portainer-2.json b/catalogue-portainer-2.json
new file mode 100644
index 0000000..7365391
--- /dev/null
+++ b/catalogue-portainer-2.json
@@ -0,0 +1,559 @@
+{
+	"version": "2",
+	"templates": [
+		{
+			"description": "API backend based on Strapi",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "wapps_api",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "POSTGRES_DB"
+				},
+				{
+					"default": "wapps_api",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "POSTGRES_USER"
+				},
+				{
+					"default": "wapps_api",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "POSTGRES_PASSWORD"
+				}
+			],
+			"name": "api",
+			"note": "This wapp provides an API backend. To secure access to this sensible wapp, it is exposed exclusively via the <code>HTTPS_MGMT_PORT</code> as configured in the <code>.env</code> file of your wappster instance",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/api/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "api",
+			"type": 3
+		},
+		{
+			"description": "Database management based on Adminer",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				}
+			],
+			"name": "data",
+			"note": "This wapp provides access to all databases deployed by other wapps. To secure access to this sensible wapp, it is exposed exclusively via the <code>HTTPS_MGMT_PORT</code> as configured in the <code>.env</code> file of your wappster instance",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/data/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "data",
+			"type": 3
+		},
+		{
+			"description": "DNS-level ad blocker based on Pi-hole",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "1.1.1.1",
+					"description": "IP of the primary upstream DNS provider, i.e. 1.1.1.1",
+					"label": "Primary DNS",
+					"name": "DNS1"
+				},
+				{
+					"default": "1.0.0.1",
+					"description": "IP of the secondary upstream DNS provider, i.e. 1.0.0.1",
+					"label": "Secondary DNS",
+					"name": "DNS2"
+				},
+				{
+					"description": "The server IP listening to DNS and DHCP requests",
+					"label": "Server IP",
+					"name": "IP"
+				},
+				{
+					"description": "Initial administrator password, please change after first login",
+					"label": "Password",
+					"name": "PASSWORD"
+				},
+				{
+					"default": "Europe/Zurich",
+					"description": "Time zone for this app (format: Europe/Zurich)",
+					"label": "Time zone",
+					"name": "TZ"
+				},
+				{
+					"description": "Path to custom hosts file used for DNS lookup, located on your wappster instance",
+					"label": "Hosts file",
+					"name": "HOSTS_FILE"
+				}
+			],
+			"name": "dns",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/dns/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "dns",
+			"type": 3
+		},
+		{
+			"description": "Static file server based on Caddy",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"description": "The root folder containing the files to be served",
+					"label": "Root folder",
+					"name": "ROOT"
+				}
+			],
+			"name": "get",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/get/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "get",
+			"type": 3
+		},
+		{
+			"description": "IP address management (IPAM) based on Netbox",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "wapps_ipam",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "POSTGRES_DB"
+				},
+				{
+					"default": "wapps_ipam",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "POSTGRES_USER"
+				},
+				{
+					"default": "wapps_ipam",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "POSTGRES_PASSWORD"
+				},
+				{
+					"description": "Random string required by the wapp, recommended minimum length: 50 characters",
+					"label": "Secret key",
+					"name": "SECRET_KEY"
+				}
+			],
+			"name": "ipam",
+			"note": "After deploying this wapp, you need to create a new user via the container’s command line. Inside Portainer, select the container <code>${NAME}_netbox_1</code>. Connect to the container's console, execute the following command and fill in the required pieces of info (username, email address and password): <code>python3 manage.py createsuperuser</code>",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/ipam/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "ipam",
+			"type": 3
+		},
+		{
+			"description": "RDP gateway based on Guacamole",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "wapps_jump",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "MYSQL_DATABASE"
+				},
+				{
+					"default": "wapps_jump",
+					"description": "The password of the root user",
+					"label": "Root password",
+					"name": "MYSQL_ROOT_PASSWORD"
+				},
+				{
+					"default": "wapps_jump",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "MYSQL_USER"
+				},
+				{
+					"default": "wapps_jump",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "MYSQL_PASSWORD"
+				}
+			],
+			"name": "jump",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/jump/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "jump",
+			"type": 3
+		},
+		{
+			"description": "Wiki based on Wiki.js",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "wapps_know",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "POSTGRES_DB"
+				},
+				{
+					"default": "wapps_know",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "POSTGRES_USER"
+				},
+				{
+					"default": "wapps_know",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "POSTGRES_PASSWORD"
+				}
+			],
+			"name": "know",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/know/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "know",
+			"type": 3
+		},
+		{
+			"description": "PVR for movies based on Radarr",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"description": "Location of movie library on disk",
+					"label": "Movies root folder",
+					"name": "MOVIES_ROOT"
+				},
+				{
+					"description": "Location of download manager output directory",
+					"label": "Downloads root folder",
+					"name": "DOWNLOADS_ROOT"
+				},
+				{
+					"default": "1000",
+					"description": "PUID, i.e. 1000",
+					"label": "User identifier",
+					"name": "PUID"
+				},
+				{
+					"default": "1000",
+					"description": "PGID, i.e. 1000",
+					"label": "Group identifier",
+					"name": "PGID"
+				},
+				{
+					"default": "Europe/Zurich",
+					"description": "Time zone for this app (format: Europe/Zurich)",
+					"label": "Time zone",
+					"name": "TZ"
+				},
+				{
+					"default": "022",
+					"description": "Control permissions of files and directories created by this app, i.e. 022",
+					"label": "umask set",
+					"name": "UMASK_SET"
+				}
+			],
+			"name": "pvrm",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/pvr-movies/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "pvrm",
+			"type": 3
+		},
+		{
+			"description": "PVR for TV series based on Sonarr",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"description": "Location of TV series library on disk",
+					"label": "TV series root folder",
+					"name": "SERIES_ROOT"
+				},
+				{
+					"description": "Location of download manager output directory",
+					"label": "Downloads root folder",
+					"name": "DOWNLOADS_ROOT"
+				},
+				{
+					"default": "1000",
+					"description": "PUID, i.e. 1000",
+					"label": "User identifier",
+					"name": "PUID"
+				},
+				{
+					"default": "1000",
+					"description": "PGID, i.e. 1000",
+					"label": "Group identifier",
+					"name": "PGID"
+				},
+				{
+					"default": "Europe/Zurich",
+					"description": "Time zone for this app (format: Europe/Zurich)",
+					"label": "Time zone",
+					"name": "TZ"
+				},
+				{
+					"default": "022",
+					"description": "Control permissions of files and directories created by this app, i.e. 022",
+					"label": "umask set",
+					"name": "UMASK_SET"
+				}
+			],
+			"name": "pvrs",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/pvr-series/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "pvrs",
+			"type": 3
+		},
+		{
+			"description": "Password manager based on Passit",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"default": "wapps_safe",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "POSTGRES_DB"
+				},
+				{
+					"default": "wapps_safe",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "POSTGRES_USER"
+				},
+				{
+					"default": "wapps_safe",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "POSTGRES_PASSWORD"
+				},
+				{
+					"description": "Random string required by the wapp, recommended minimum length: 50 characters",
+					"label": "Secret key",
+					"name": "SECRET_KEY"
+				},
+				{
+					"description": "Email protocol to use for sending out emails from the wapp",
+					"label": "Email protocol",
+					"name": "EMAIL_PROTOCOL",
+					"select": [
+						{
+							"text": "SMTP",
+							"value": "smtp"
+						},
+						{
+							"text": "SMTP+SSL",
+							"value": "smtp+ssl"
+						},
+						{
+							"text": "SMTP+TLS",
+							"value": "smtp+tls"
+						},
+						{
+							"text": "Console mail",
+							"value": "consolemail"
+						},
+						{
+							"text": "File mail",
+							"value": "filemail"
+						},
+						{
+							"text": "LocMem mail",
+							"value": "memorymail"
+						},
+						{
+							"text": "Dummy mail",
+							"value": "dummymail"
+						}
+					]
+				},
+				{
+					"description": "The email user account to send emails from",
+					"label": "Email user",
+					"name": "EMAIL_USER"
+				},
+				{
+					"description": "The email user password",
+					"label": "Email password",
+					"name": "EMAIL_PASSWORD"
+				},
+				{
+					"description": "The email server to send emails from",
+					"label": "Email host",
+					"name": "EMAIL_HOST"
+				},
+				{
+					"description": "The email server port to connect to",
+					"label": "Port of email host",
+					"name": "EMAIL_PORT"
+				},
+				{
+					"description": "Sender address to be used in the from field",
+					"label": "Email sender address",
+					"name": "EMAIL_SENDER"
+				}
+			],
+			"name": "safe",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/safe/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "safe",
+			"type": 3
+		},
+		{
+			"description": "Simple storage app based on Minio",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"description": "The access key represents the user name",
+					"label": "Access key",
+					"name": "MINIO_ACCESS_KEY"
+				},
+				{
+					"description": "The secret key represents the password",
+					"label": "Secret key",
+					"name": "MINIO_SECRET_KEY"
+				},
+				{
+					"description": "The root folder containing the files and folders to be served",
+					"label": "Root folder",
+					"name": "ROOT"
+				}
+			],
+			"name": "sss",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/sss/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "sss",
+			"type": 3
+		},
+		{
+			"description": "Website analytics based on Matomo",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				},
+				{
+					"description": "The location of the local Matomo misc folder",
+					"label": "Matomo misc folder",
+					"name": "MATOMO_MISC_DIR"
+				},
+				{
+					"default": "wapps_trck",
+					"description": "The name of the database",
+					"label": "Database",
+					"name": "MYSQL_DATABASE"
+				},
+				{
+					"default": "wapps_trck",
+					"description": "The password of the root user",
+					"label": "Root password",
+					"name": "MYSQL_ROOT_PASSWORD"
+				},
+				{
+					"default": "wapps_trck",
+					"description": "The name of the database user",
+					"label": "Database user",
+					"name": "MYSQL_USER"
+				},
+				{
+					"default": "wapps_trck",
+					"description": "The password of the database user",
+					"label": "Database password",
+					"name": "MYSQL_PASSWORD"
+				}
+			],
+			"name": "trck",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/trck/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "trck",
+			"type": 3
+		},
+		{
+			"description": "Media downloader based on AllTube Download",
+			"env": [
+				{
+					"description": "The DNS hostname pointing to this app",
+					"label": "Host",
+					"name": "HOST"
+				}
+			],
+			"name": "tube",
+			"note": "This wapp can generate a substantial amount of traffic on your host if left accessible to the public. To secure access to this sensible wapp, it is exposed exclusively via the <code>HTTPS_MGMT_PORT</code> as configured in the <code>.env</code> file of your wappster instance",
+			"platform": "linux",
+			"repository": {
+				"stackfile": "composition/tube/docker-compose.yml",
+				"url": "https://github.com/MichaelSchmidle/wapps"
+			},
+			"title": "tube",
+			"type": 3
+		}
+	]
+}
\ No newline at end of file