diff --git a/README.md b/README.md
index 7a17a1f..013902c 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,12 @@
-# Bastille Combined Templates
+# Bastille Templates
 
 ## Status - Beta
-This repository is a collection of Bastille templates all aggregated into
-one place. This means you can add ALL the templates with one command. What's
-more, the structure mimicks the FreeBSD ports tree. This means that you should
-be able to find a template in a standard location to match any package origin.
-
-Code is being tested to support this new combined method alongside the existing
-format. This means you can still use your existing custom templates while also
-taking advantage of the new combined collection.
-
-This status will be removed once this new support has been added and merged.
+This repository is a collection of Bastille templates all aggregated into one
+place. This means you can add ALL the templates with one command. What's more,
+the structure mimicks the FreeBSD ports tree. This means that you should be
+able to find a template in a standard location to match any package origin.
 
+## Usage
 To use templates you must have git installed on your system.
 ```shell
 pkg install git
@@ -22,13 +17,18 @@ pkg install git
 bastille bootstrap https://github.com/bastillebsd/templates
 ```
 
-## Usage
+## Bastille Usage
 ```shell
-bastille template TARGET [pkg/origin]
+bastille template TARGET [category/port]
 ```
 
-### Examples
+## Rocinante Usage
+```shell
+rocinante template [category/port]
 ```
+
+### Bastille Examples
+```shell
 bastille template TARGET www/nginx
 bastille template TARGET shells/zsh
 bastille template TARGET lang/python311
@@ -36,3 +36,9 @@ bastille template TARGET databases/mariadb1011-server
 ...etc...
 
 ```
+
+### Rocinante Examples
+```shell
+rocinante template x11/slim
+rocinante template net/openntpd
+```
diff --git a/databases/influxdb/README.md b/databases/influxdb/README.md
index 4a7f1e2..e931ed5 100644
--- a/databases/influxdb/README.md
+++ b/databases/influxdb/README.md
@@ -1,5 +1,5 @@
 ## influxdb
-Bastille Template to bootstrap InfluxDB
+Bastille template to bootstrap InfluxDB
 
 ## Usage
 ```shell
diff --git a/databases/percona/README.md b/databases/percona/README.md
index 9cc59a3..bd9eece 100644
--- a/databases/percona/README.md
+++ b/databases/percona/README.md
@@ -1,15 +1,8 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/percona/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/percona/commits/master)
-
 ## percona
-Bastille Template: percona
+Bastille template: percona
 
 Fetch and apply this template with:
 
 ```shell
-bastille bootstrap https://gitlab.com/bastillebsd-templates/percona
-bastille template TARGET bastillebsd-templates/percona
+bastille template TARGET databases/percona
 ```
-
-## Description
-This template installs a percona server and client.
diff --git a/dns/unbound/README.md b/dns/unbound/README.md
index ee38034..cad5133 100644
--- a/dns/unbound/README.md
+++ b/dns/unbound/README.md
@@ -1,5 +1,5 @@
 ## unbound
-Bastille Template for an Unbound DNS container
+Bastille template for an Unbound DNS container
 
 ## Usage
 ```shell
diff --git a/games/minecraft-server/README.md b/games/minecraft-server/README.md
index 7c04454..0fc7eb1 100644
--- a/games/minecraft-server/README.md
+++ b/games/minecraft-server/README.md
@@ -1,6 +1,3 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/minecraft-server/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/minecraft-server/commits/master)
-
 ## minecraft-server
 Bastille template for a minecraft server.
 
@@ -20,7 +17,7 @@ existing on the host system.
 To install (or update) `/usr/ports` on the host system use `portsnap` as seen here:
 
 ```shell
-ishmael ~ # portsnap fetch auto
+portsnap fetch auto
 ```
 
 Note: the ports tree is mounted read-only within the container.
@@ -28,7 +25,7 @@ Note: the ports tree is mounted read-only within the container.
 ## Apply template
 
 ```shell
-ishmael ~ # bastille template TARGET bastillebsd-templates/minecraft-server
+bastille template TARGET games/minecraft-server
 ```
 
 ## Access server console
@@ -37,7 +34,7 @@ The minecraft server will run in `STANDALONE` mode meaning the service execution
 will happen within a `tmux` session. To access this session use this command: 
 
 ```shell
-ishmael ~ # bastille service TARGET minecraft console
+bastille service TARGET minecraft console
 ```
 
 Tip: `tmux` session management is handled using `ctrl-b` prefix. To exit the
diff --git a/lang/go120/README.md b/lang/go120/README.md
index d4a043a..635aeb0 100644
--- a/lang/go120/README.md
+++ b/lang/go120/README.md
@@ -1,11 +1,6 @@
 ## golang
 Bastille template to bootstrap Go 1.20
 
-## Bootstrap
-```shell
-bastille bootstrap https://github.com/bastillebsd/templates
-```
-
 ## Usage
 ```shell
 bastille template TARGET lang/go120
diff --git a/lang/perl/Bastillefile b/lang/perl/Bastillefile
new file mode 100644
index 0000000..6408fe6
--- /dev/null
+++ b/lang/perl/Bastillefile
@@ -0,0 +1 @@
+PKG perl5-devel
diff --git a/lang/perl/PKG b/lang/perl/PKG
deleted file mode 100644
index a59a340..0000000
--- a/lang/perl/PKG
+++ /dev/null
@@ -1 +0,0 @@
-perl5-devel
diff --git a/lang/perl/README.md b/lang/perl/README.md
index 09c1ee5..7786a60 100644
--- a/lang/perl/README.md
+++ b/lang/perl/README.md
@@ -1,10 +1,7 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/perl/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/perl/commits/master)
-
 ## perl
 Bastille Template to bootstrap perl5-devel
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/perl
+bastille template TARGET lang/perl
 ```
diff --git a/lang/php/README.md b/lang/php/README.md
index 989d197..5f482b0 100644
--- a/lang/php/README.md
+++ b/lang/php/README.md
@@ -3,5 +3,5 @@ Bastille template to bootstrap PHP
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/php
+bastille template TARGET lang/php
 ```
diff --git a/lang/ruby/Bastillefile b/lang/ruby/Bastillefile
new file mode 100644
index 0000000..f3ea12e
--- /dev/null
+++ b/lang/ruby/Bastillefile
@@ -0,0 +1 @@
+PKG ruby
diff --git a/lang/ruby/PKG b/lang/ruby/PKG
deleted file mode 100644
index 6cec934..0000000
--- a/lang/ruby/PKG
+++ /dev/null
@@ -1 +0,0 @@
-ruby
diff --git a/lang/ruby/README.md b/lang/ruby/README.md
index 8b563f6..1120041 100644
--- a/lang/ruby/README.md
+++ b/lang/ruby/README.md
@@ -1,10 +1,7 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/ruby/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/ruby/commits/master)
-
 ## ruby
 Bastille template to bootstrap ruby
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/ruby
+bastille template TARGET lang/ruby
 ```
diff --git a/lang/rust/README.md b/lang/rust/README.md
index eec1362..53a873a 100644
--- a/lang/rust/README.md
+++ b/lang/rust/README.md
@@ -1,5 +1,5 @@
 # rust
-Bastille Template to bootstrap Rust
+Bastille template to bootstrap Rust
 
 ## Usage
 ```shell
diff --git a/misc/n8n/README.md b/misc/n8n/README.md
index 84ed4cd..42d44d9 100644
--- a/misc/n8n/README.md
+++ b/misc/n8n/README.md
@@ -1,12 +1,8 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/n8n/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/n8n/commits/master)
-
-
 ## n8n
 Bastille Template for a n8n
 
 ## Usage
 
 ```shell
-ishmael ~ # bastille template TARGET bastillebsd-templates/n8n
+bastille template TARGET misc/n8n
 ```
diff --git a/misc/uptime-kuma/README.md b/misc/uptime-kuma/README.md
index c3617fd..5174989 100644
--- a/misc/uptime-kuma/README.md
+++ b/misc/uptime-kuma/README.md
@@ -1,9 +1,7 @@
-
 ## Uptime-Kuma
 Bastille Template for [Uptime Kuma](https://github.com/louislam/uptime-kuma) a self-hosted monitoring tool
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/uptime-kuma
+bastille template TARGET misc/uptime-kuma
 ```
-
diff --git a/multimedia/jellyfin/README.md b/multimedia/jellyfin/README.md
index 135f0be..6e29af4 100644
--- a/multimedia/jellyfin/README.md
+++ b/multimedia/jellyfin/README.md
@@ -1,8 +1,7 @@
-
 ## jellyfin
-Bastille Template for Jellyfin
+Bastille template for Jellyfin
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/jellyfin
+bastille template TARGET multimedia/jellyfin
 ```
diff --git a/multimedia/plexmediaserver-plexpass/README.md b/multimedia/plexmediaserver-plexpass/README.md
index 4dee486..37af116 100644
--- a/multimedia/plexmediaserver-plexpass/README.md
+++ b/multimedia/plexmediaserver-plexpass/README.md
@@ -1,5 +1,5 @@
 ## plexmediaserver-plexpass
-Bastille template for PlexMediaServer PlexPass
+Bastille template for Plex Media Server PlexPass Edition
 
 ## Usage
 
diff --git a/multimedia/plexmediaserver/README.md b/multimedia/plexmediaserver/README.md
index cfa2059..a79823b 100644
--- a/multimedia/plexmediaserver/README.md
+++ b/multimedia/plexmediaserver/README.md
@@ -1,5 +1,5 @@
 ## plexmediaserver
-Bastille Template for a Plex Server Jail
+Bastille template for a Plex Media Server
 
 ## Usage
 ```shell
diff --git a/net-mgmt/prometheus/README.md b/net-mgmt/prometheus/README.md
index 1a1689d..7557605 100644
--- a/net-mgmt/prometheus/README.md
+++ b/net-mgmt/prometheus/README.md
@@ -1,5 +1,5 @@
 ## prometheus
-Bastille Template to bootstrap Prometheus.
+Bastille template to bootstrap Prometheus.
 
 ## Usage
 ```shell
diff --git a/net-mgmt/semaphore/README.md b/net-mgmt/semaphore/README.md
index abc4892..0b17010 100644
--- a/net-mgmt/semaphore/README.md
+++ b/net-mgmt/semaphore/README.md
@@ -1,9 +1,8 @@
-
 ## semaphore
-Bastille Template for Semaphore
+Bastille template for Semaphore
 
 ## Usage
 
 ```shell
-ishmael ~ # bastille template TARGET bastillebsd-templates/semaphore
+bastille template TARGET net-mgmt/semaphore
 ```
diff --git a/net-mgmt/telegraf/README.md b/net-mgmt/telegraf/README.md
index e183646..682295b 100644
--- a/net-mgmt/telegraf/README.md
+++ b/net-mgmt/telegraf/README.md
@@ -1,5 +1,5 @@
 ## telegraf
-Bastille Template to bootstrap Telegraf
+Bastille template to bootstrap Telegraf
 
 ## Usage
 ```shell
diff --git a/net-mgmt/unifi/README.md b/net-mgmt/unifi/README.md
index e7e624b..2dc335f 100644
--- a/net-mgmt/unifi/README.md
+++ b/net-mgmt/unifi/README.md
@@ -3,5 +3,5 @@ Bastille template to bootstrap Unifi
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/unifi
+bastille template TARGET net-mgmt/unifi
 ```
diff --git a/net-mgmt/zabbix-agent/README.md b/net-mgmt/zabbix-agent/README.md
index 1bf5cd3..6377294 100644
--- a/net-mgmt/zabbix-agent/README.md
+++ b/net-mgmt/zabbix-agent/README.md
@@ -1,10 +1,10 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/zabbix-agent/badges/master/pipeline.svg)](https://gitlab.com/bastillebsd-templates/zabbix-agent/commits/master)
+# zabbix-agent
+Bastille template to bootstrap zabbix-agent
 
 ## Usage
 
 ```shell
-bastille template TARGET bastillebsd-templates/zabbix-agent
+bastille template TARGET net-mgmt/zabbix-agent
 ```
 
 ## Post Install Steps
diff --git a/net-mgmt/zabbix-server/Bastillefile b/net-mgmt/zabbix-server/Bastillefile
index a270952..abb42a5 100644
--- a/net-mgmt/zabbix-server/Bastillefile
+++ b/net-mgmt/zabbix-server/Bastillefile
@@ -1,5 +1,5 @@
-INCLUDE bastillebsd-templates/nginx
-INCLUDE bastillebsd-templates/mysql-server
+INCLUDE www/nginx
+INCLUDE databases/mysql-server
 PKG zabbix54-server zabbix54-frontend zabbix54-agent
 
 SYSRC zabbix_server_enable=YES
diff --git a/net-mgmt/zabbix-server/README.md b/net-mgmt/zabbix-server/README.md
index c077834..b8b1971 100644
--- a/net-mgmt/zabbix-server/README.md
+++ b/net-mgmt/zabbix-server/README.md
@@ -1,9 +1,8 @@
-
 ## zabbix-server
 Bastille template to bootstrap zabbix-server
 
 ## Usage
 
 ```shell
-bastille template TARGET bastillebsd-templates/zabbix-server
+bastille template TARGET net-mgmt/zabbix-server
 ```
diff --git a/net-p2p/bazarr/README.md b/net-p2p/bazarr/README.md
index bf734ba..1a7d6c3 100644
--- a/net-p2p/bazarr/README.md
+++ b/net-p2p/bazarr/README.md
@@ -1,15 +1,11 @@
-## Status
-
-[![pipeline status](https://gitlab.com/bastillebsd-templates/bazarr/badges/main/pipeline.svg)](https://gitlab.com/bastillebsd-templates/bazarr/commits/main)
-
 ## Bazarr
-
-Bazarr is a companion application to Sonarr and Radarr that manages and downloads subtitles based on your requirements.
+Bazarr is a companion application to Sonarr and Radarr that manages and
+downloads subtitles based on your requirements.
 
 ## Usage
 
 ```shell
-bastille template TARGET bastillebsd-templates/bazarr
+bastille template TARGET net-p2p/bazarr
 ```
 
-For more options edit `/usr/local/bastille/templates/bastillebsd-templates/bazarr/Bastillefile`
+For more options edit `/usr/local/bastille/templates/net-p2p/bazarr/Bastillefile`
diff --git a/net-p2p/lidarr/README.md b/net-p2p/lidarr/README.md
index a288ca6..08f7324 100644
--- a/net-p2p/lidarr/README.md
+++ b/net-p2p/lidarr/README.md
@@ -1,16 +1,14 @@
-## Status
-
-[![pipeline status](https://gitlab.com/bastillebsd-templates/lidarr/badges/main/pipeline.svg)](https://gitlab.com/bastillebsd-templates/lidarr/commits/main)
-
 ## Lidarr
-
-Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured
-to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+Lidarr is a music collection manager for Usenet and BitTorrent users. It can
+monitor multiple RSS feeds for new tracks from your favorite artists and will
+grab, sort and rename them. It can also be configured to automatically upgrade
+the quality of files already downloaded when a better quality format becomes
+available.
 
 ## Usage
 
 ```shell
-bastille template TARGET bastillebsd-templates/lidarr
+bastille template TARGET net-p2p/lidarr
 ```
 
-For more options edit `/usr/local/bastille/templates/bastillebsd-templates/lidarr/Bastillefile`
+For more options edit `/usr/local/bastille/templates/net-p2p/lidarr/Bastillefile`
diff --git a/net-p2p/prowlarr/README.md b/net-p2p/prowlarr/README.md
index fcd1e66..2fac7d9 100644
--- a/net-p2p/prowlarr/README.md
+++ b/net-p2p/prowlarr/README.md
@@ -1,12 +1,13 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/prowlarr/badges/main/pipeline.svg)](https://gitlab.com/bastillebsd-templates/prowlarr/commits/main)
-
 ## Prowlarr
-Prowlarr is an indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports management of both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
+Prowlarr is an indexer manager/proxy built on the popular arr .net/reactjs base
+stack to integrate with your various PVR apps. Prowlarr supports management of
+both Torrent Trackers and Usenet Indexers. It integrates seamlessly with
+Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of
+your indexers with no per app Indexer setup required (we do it all).
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/prowlarr
+bastille template TARGET net-p2p/prowlarr
 ```
 
-For more options edit `/usr/local/bastille/templates/bastillebsd-templates/Prowlarr/Bastillefile`
+For more options edit `/usr/local/bastille/templates/net-p2p/prowlarr/Bastillefile`
diff --git a/net-p2p/radarr/README.md b/net-p2p/radarr/README.md
index 0b40bdc..25741fc 100644
--- a/net-p2p/radarr/README.md
+++ b/net-p2p/radarr/README.md
@@ -1,11 +1,8 @@
-## Status
-[![pipeline status](https://gitlab.com/bastillebsd-templates/radarr/badges/main/pipeline.svg)](https://gitlab.com/bastillebsd-templates/radarr/commits/main)
-
 ## Radarr
-Bastille Template for Radarr
+Bastille template for Radarr
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/radarr
+bastille template TARGET net-p2p/radarr
 ```
 
diff --git a/net-p2p/sonarr/README.md b/net-p2p/sonarr/README.md
index 92e01fb..c1e70f1 100644
--- a/net-p2p/sonarr/README.md
+++ b/net-p2p/sonarr/README.md
@@ -1,8 +1,7 @@
-
 ## sonarr
-Bastille Template for Sonarr
+Bastille template for Sonarr
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/sonarr
+bastille template TARGET net-p2p/sonarr
 ```
diff --git a/security/openssh-server/README.md b/security/openssh-server/README.md
index fa0864f..067eab8 100644
--- a/security/openssh-server/README.md
+++ b/security/openssh-server/README.md
@@ -13,7 +13,7 @@ instructions on how to do so.
 ### custom config
 Use a custom `/etc/ssh/sshd_config` in the template:
 
-1. fork bastillebsd-templates/openssh-server
+1. fork security/openssh-server
 2. add an `CP etc` directive to the Bastillefile
 3. add an `etc/ssh/sshd_config` in the template
 4. commit; bootstrap fork; apply template
@@ -21,6 +21,6 @@ Use a custom `/etc/ssh/sshd_config` in the template:
 ### Use custom `sshd_flags`:
 Use custom `sshd_flags` in jailed ssh service:
 
-1. fork bastillebsd-templates/openssh-server
+1. fork security/openssh-server
 2. update the Bastillefile and add `SYSRC sshd_flags=""`
 3. commit; bootstrap fork; apply template
diff --git a/shells/zsh-antigen/README.md b/shells/zsh-antigen/README.md
index ebc3adb..9ace6a7 100644
--- a/shells/zsh-antigen/README.md
+++ b/shells/zsh-antigen/README.md
@@ -1,5 +1,5 @@
 ## zsh-antigen
-Bastille Template to setup zsh-antigen
+Bastille template to setup zsh-antigen
 
 ## Usage
 ```shell
diff --git a/sysutils/bastille/Bastillefile b/sysutils/bastille/Bastillefile
new file mode 100644
index 0000000..487b2a8
--- /dev/null
+++ b/sysutils/bastille/Bastillefile
@@ -0,0 +1,4 @@
+PKG bastille
+SYSRC bastille_enable=YES
+CMD bastille setup
+CMD bastille bootstrap https://github.com/bastillebsd/templates
diff --git a/sysutils/bastille/README.md b/sysutils/bastille/README.md
new file mode 100644
index 0000000..ccbb1f7
--- /dev/null
+++ b/sysutils/bastille/README.md
@@ -0,0 +1,13 @@
+# sysutils/bastille
+Jail automation framework
+https://bastillebsd.org
+
+## Bastille Usage
+```shell
+bastille template TARGET sysutils/bastille
+```
+
+## Rocinante Usage
+```shell
+rocinante template sysutils/bastille
+```
diff --git a/sysutils/rocinante/Bastillefile b/sysutils/rocinante/Bastillefile
new file mode 100644
index 0000000..b08221d
--- /dev/null
+++ b/sysutils/rocinante/Bastillefile
@@ -0,0 +1,2 @@
+PKG rocinante
+CMD rocinante bootstrap https://github.com/bastillebsd/templates
diff --git a/sysutils/rocinante/README.md b/sysutils/rocinante/README.md
new file mode 100644
index 0000000..91be1b0
--- /dev/null
+++ b/sysutils/rocinante/README.md
@@ -0,0 +1,12 @@
+# rocinante
+Bastille template to bootstrap Rocinante
+
+## Bastille Usage
+```shell
+bastille template TARGET sysutils/rocinante
+```
+
+## Rocinante Usage
+```shell
+rocinante template sysutils/rocinante
+```
diff --git a/sysutils/salt-minion/README.md b/sysutils/salt-minion/README.md
index 31805d9..9257f35 100644
--- a/sysutils/salt-minion/README.md
+++ b/sysutils/salt-minion/README.md
@@ -3,5 +3,5 @@ Bastille template to bootstrap Salt Minion
 
 ## Usage
 ```shell
-ishmael ~ # bastille template TARGET sysutils/salt-minion
+bastille template TARGET sysutils/salt-minion
 ```
diff --git a/www/adguardhome-exporter/README.md b/www/adguardhome-exporter/README.md
index 6727caf..6a5f586 100644
--- a/www/adguardhome-exporter/README.md
+++ b/www/adguardhome-exporter/README.md
@@ -1,8 +1,7 @@
-
 ## adguardhome-exporter
-Bastille Template for Adguard Home Prometheus Exporter
+Bastille template for Adguard Home Prometheus Exporter
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/adguardhome-exporter
+bastille template TARGET www/adguardhome-exporter
 ```
diff --git a/www/adguardhome/README.md b/www/adguardhome/README.md
index c8623e3..3d9510e 100644
--- a/www/adguardhome/README.md
+++ b/www/adguardhome/README.md
@@ -1,5 +1,5 @@
 ## adguardhome
-Bastille Template for Adguard Home
+Bastille template for Adguard Home
 
 ## Usage
 ```shell
diff --git a/www/forgejo/Bastillefile b/www/forgejo/Bastillefile
new file mode 100644
index 0000000..75d4495
--- /dev/null
+++ b/www/forgejo/Bastillefile
@@ -0,0 +1,11 @@
+ARG SECRET_KEY
+ARG JWT_SECRET
+ARG INTERNAL_TOKEN
+
+PKG forgejo
+CP usr /
+RENDER /usr/local/etc/forgejo/conf/app.ini
+CMD chown -R git:git /usr/local/etc/forgejo
+SYSRC forgejo_enable=YES
+CMD export FORGEJO_CUSTOM=/usr/local/etc/forgejo
+SERVICE forgejo start
diff --git a/www/forgejo/README.md b/www/forgejo/README.md
new file mode 100644
index 0000000..dda6a57
--- /dev/null
+++ b/www/forgejo/README.md
@@ -0,0 +1,13 @@
+# www/forgejo
+Compact self-hosted Git service
+https://forgejo.org/
+
+## Bastille Usage
+```shell
+bastille template TARGET www/forgejo --arg SECRET_KEY=`openssl rand -base64 16` --arg JWT_SECRET=`openssl rand -base64 32` --arg INTERNAL_TOKEN=`openssl rand -base64 64`
+```
+
+## Rocinante Usage
+```shell
+bastille template www/forgejo --arg SECRET_KEY=`openssl rand -base64 16` --arg JWT_SECRET=`openssl rand -base64 32` --arg INTERNAL_TOKEN=`openssl rand -base64 64`
+```
diff --git a/www/forgejo/usr/local/etc/gitea/conf/app.ini b/www/forgejo/usr/local/etc/gitea/conf/app.ini
new file mode 100644
index 0000000..7835628
--- /dev/null
+++ b/www/forgejo/usr/local/etc/gitea/conf/app.ini
@@ -0,0 +1,92 @@
+#
+# Sample Configuration for Gitea using SQLite
+#
+# For information on the available settings, consult the online
+# documentation, or see the accompanying file app.ini.defaults, which
+# contains the settings incorporated into the gitea binary.
+#
+# This sample configuration runs Gitea with a local database.  Before
+# running this configuration, make sure to change the INTERNAL_TOKEN,
+# JWT_SECRET, and SECRET_KEY variables.  SECRET_KEY is a password of your
+# choosing, INTERNAL_TOKEN is a 64-byte random number in BASE64 encoding,
+# JWT_SECRET is a 32-byte random number in BASE64 encoding.
+#
+# You can generate the token using for example:
+# openssl rand -base64 64
+#
+# You can let Gitea add these to the config for you; you need to make
+# app.ini writeable by the git user.
+#
+# There are no pre-configured users; the first user to register becomes an
+# admin.  In this sample configuration, the HTTP server only listens on
+# localhost.
+#
+# If you'd rather use the web-based installer, remove this conf/app.ini file
+# and make /usr/local/etc/gitea/conf writeable to the git user.
+APP_NAME = Gitea: Git with a cup of tea
+RUN_USER = git
+RUN_MODE = prod
+
+[database]
+DB_TYPE  = sqlite3
+HOST     = ${JAIL_IP}:3306
+NAME     = gitea
+PASSWD   =
+PATH     = /var/db/gitea/gitea.db
+SSL_MODE = disable
+USER     = root
+
+[indexer]
+ISSUE_INDEXER_PATH = /var/db/gitea/indexers/issues.bleve
+
+[log]
+ROOT_PATH = /var/log/gitea
+MODE      = file
+LEVEL     = Info
+
+[mailer]
+ENABLED = false
+
+[oauth2]
+JWT_SECRET = ${JWT_SECRET}
+
+[picture]
+AVATAR_UPLOAD_PATH      = /var/db/gitea/data/avatars
+DISABLE_GRAVATAR        = false
+ENABLE_FEDERATED_AVATAR = false
+
+[repository]
+ROOT        = /var/db/gitea/gitea-repositories
+# Gitea's default is 'bash', so if you have bash installed, you can comment
+# this out.
+SCRIPT_TYPE = sh
+
+[repository.upload]
+TEMP_PATH = /var/db/gitea/data/tmp/uploads
+
+[security]
+INSTALL_LOCK   = true
+INTERNAL_TOKEN = ${INTERNAL_TOKEN}
+SECRET_KEY     = ${SECRET_KEY}
+
+[session]
+PROVIDER        = file
+PROVIDER_CONFIG = /var/db/gitea/data/sessions
+
+[server]
+DOMAIN        = ${JAIL_NAME}
+HTTP_ADDR     = ${JAIL_IP}
+HTTP_PORT     = 3000
+ROOT_URL      = http://${JAIL_IP}:3000/
+DISABLE_SSH   = false
+SSH_DOMAIN    = %(DOMAIN)s
+SSH_PORT      = 22
+OFFLINE_MODE  = false
+APP_DATA_PATH = /var/db/gitea/data
+
+[service]
+REGISTER_EMAIL_CONFIRM = false
+ENABLE_NOTIFY_MAIL     = false
+DISABLE_REGISTRATION   = false
+ENABLE_CAPTCHA         = true
+REQUIRE_SIGNIN_VIEW    = false
diff --git a/www/gitlab-ce/PKG b/www/gitlab-ce/PKG
deleted file mode 100644
index a35d799..0000000
--- a/www/gitlab-ce/PKG
+++ /dev/null
@@ -1 +0,0 @@
-gitlab-ce
diff --git a/www/gitlab-ce/README.md b/www/gitlab-ce/README.md
index d4a54b1..973a1d7 100644
--- a/www/gitlab-ce/README.md
+++ b/www/gitlab-ce/README.md
@@ -3,5 +3,5 @@ Bastille template to bootstrap GitLab CE
 
 ## Usage
 ```shell
-bastille template TARGET bastillebsd-templates/gitlab-ce
+bastille template TARGET www/gitlab-ce
 ```
diff --git a/www/gitlab-ce/SERVICE b/www/gitlab-ce/SERVICE
deleted file mode 100644
index 11103db..0000000
--- a/www/gitlab-ce/SERVICE
+++ /dev/null
@@ -1 +0,0 @@
-gitlab start
diff --git a/www/gitlab-ce/SYSRC b/www/gitlab-ce/SYSRC
deleted file mode 100644
index 18e727d..0000000
--- a/www/gitlab-ce/SYSRC
+++ /dev/null
@@ -1 +0,0 @@
-gitlab_enable=YES
diff --git a/www/nextcloud/Bastillefile b/www/nextcloud/Bastillefile
index 20f3ccd..0d53093 100644
--- a/www/nextcloud/Bastillefile
+++ b/www/nextcloud/Bastillefile
@@ -1,4 +1,4 @@
-INCLUDE bastillebsd-templates/mariadb-server
-INCLUDE bastillebsd-templates/apache
+INCLUDE databases/mariadb-server
+INCLUDE www/apache
 
-PKG nextcloud-php74
+PKG nextcloud-php84