diff --git a/templates/Rancher Active Proxy/0/docker-compose.yml b/templates/Rancher Active Proxy/0/docker-compose.yml
new file mode 100644
index 0000000..95c6f9b
--- /dev/null
+++ b/templates/Rancher Active Proxy/0/docker-compose.yml	
@@ -0,0 +1,33 @@
+version: '2'
+services:
+  Rancher-Active-Proxy:
+    image: adi90x/rancher-active-proxy
+    environment:
+      DEFAULT_HOST: ${DEFAULT_HOST}
+      DEFAULT_EMAIL: ${DEFAULT_EMAIL}
+      CRON: ${CRON}
+      DEBUG: ${DEBUG}
+      DEFAULT_PORT: ${DEFAULT_PORT}
+    stdin_open: true
+    volumes:
+    - proxy-htpasswd:/etc/nginx/htpasswd
+    - proxy-vhost:/etc/nginx/vhost.d
+    - proxy-le:/etc/letsencrypt
+    - proxy-html:/usr/share/nginx/html
+    tty: true
+    ports:
+    - ${DEFAULT_PORT}:80/tcp
+    - 443:443/tcp
+    labels:
+      io.rancher.container.pull_image: always
+      io.rancher.scheduler.global: 'true'
+
+volumes:
+  proxy-htpasswd:
+    driver: rancher-nfs
+  proxy-vhost:
+    driver: rancher-nfs
+  proxy-le:
+    driver: rancher-nfs
+  proxy-html:
+    driver: rancher-nfs
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/0/rancher-compose.yml b/templates/Rancher Active Proxy/0/rancher-compose.yml
new file mode 100644
index 0000000..bcee9c9
--- /dev/null
+++ b/templates/Rancher Active Proxy/0/rancher-compose.yml	
@@ -0,0 +1,23 @@
+.catalog:
+ name: "Initial Version"
+ version: "v0.0.2"
+ questions:    
+    - variable: DEFAULT_HOST
+      label: "Default Virtual Host to use"
+      type: string
+    - variable: DEFAULT_EMAIL
+      label: "Default Email to use for Letsencrypt"
+      default: "info@tstgmbh.com"
+      type: string    
+    - variable: DEFAULT_PORT
+      label: "Default Port to use"
+      default: "80"
+      type: string
+    - variable: CRON
+      label: "Auto renew cron like setup"
+      default: "0 2 * * *"
+      type: string
+    - variable: DEBUG
+      label: "Set to true to enable debug"
+      default: "False"
+      type: string
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/1/docker-compose.yml b/templates/Rancher Active Proxy/1/docker-compose.yml
new file mode 100644
index 0000000..b2939dc
--- /dev/null
+++ b/templates/Rancher Active Proxy/1/docker-compose.yml	
@@ -0,0 +1,34 @@
+version: '2'
+services:
+  Rancher-Active-Proxy:
+    image: adi90x/rancher-active-proxy
+    environment:
+      DEFAULT_HOST: ${DEFAULT_HOST}
+      DEFAULT_EMAIL: ${DEFAULT_EMAIL}
+      CRON: ${CRON}
+      DEBUG: ${DEBUG}
+      DEFAULT_PORT: ${DEFAULT_PORT}
+    stdin_open: true
+    volumes:
+    - proxy-htpasswd:/etc/nginx/htpasswd
+    - proxy-vhost:/etc/nginx/vhost.d
+    - proxy-le:/etc/letsencrypt
+    - proxy-html:/usr/share/nginx/html
+    - proxy-confd:/etc/nginx/conf.d
+    tty: true
+    ports:
+    - ${DEFAULT_PORT}:80/tcp
+    - 443:443/tcp
+    labels:
+      io.rancher.container.pull_image: always
+      io.rancher.scheduler.global: 'true'
+
+volumes:
+  proxy-htpasswd:
+    driver: rancher-nfs
+  proxy-vhost:
+    driver: rancher-nfs
+  proxy-le:
+    driver: rancher-nfs
+  proxy-html:
+    driver: rancher-nfs
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/1/rancher-compose.yml b/templates/Rancher Active Proxy/1/rancher-compose.yml
new file mode 100644
index 0000000..c42409f
--- /dev/null
+++ b/templates/Rancher Active Proxy/1/rancher-compose.yml	
@@ -0,0 +1,23 @@
+.catalog:
+ name: "Initial Version"
+ version: "v0.0.3"
+ questions:    
+    - variable: DEFAULT_HOST
+      label: "Default Virtual Host to use"
+      type: string
+    - variable: DEFAULT_EMAIL
+      label: "Default Email to use for Letsencrypt"
+      default: "info@tstgmbh.com"
+      type: string    
+    - variable: DEFAULT_PORT
+      label: "Default Port to use"
+      default: "80"
+      type: string
+    - variable: CRON
+      label: "Auto renew cron like setup"
+      default: "0 2 * * *"
+      type: string
+    - variable: DEBUG
+      label: "Set to true to enable debug"
+      default: "False"
+      type: string
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/2/docker-compose.yml b/templates/Rancher Active Proxy/2/docker-compose.yml
new file mode 100644
index 0000000..fdc8796
--- /dev/null
+++ b/templates/Rancher Active Proxy/2/docker-compose.yml	
@@ -0,0 +1,36 @@
+version: '2'
+services:
+  Rancher-Active-Proxy:
+    image: adi90x/rancher-active-proxy
+    environment:
+      DEFAULT_HOST: ${DEFAULT_HOST}
+      DEFAULT_EMAIL: ${DEFAULT_EMAIL}
+      CRON: ${CRON}
+      DEBUG: ${DEBUG}
+      DEFAULT_PORT: ${DEFAULT_PORT}
+    stdin_open: true
+    volumes:
+    - proxy-htpasswd:/etc/nginx/htpasswd
+    - proxy-vhost:/etc/nginx/vhost.d
+    - proxy-le:/etc/letsencrypt
+    - proxy-html:/usr/share/nginx/html
+    - proxy-certs:/etc/nginx/certs
+    tty: true
+    ports:
+    - ${DEFAULT_PORT}:80/tcp
+    - 443:443/tcp
+    labels:
+      io.rancher.container.pull_image: always
+      io.rancher.scheduler.global: 'true'
+
+volumes:
+  proxy-htpasswd:
+    driver: rancher-nfs
+  proxy-vhost:
+    driver: rancher-nfs
+  proxy-le:
+    driver: rancher-nfs
+  proxy-html:
+    driver: rancher-nfs
+  proxy-certs:
+    driver: rancher-nfs
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/2/rancher-compose.yml b/templates/Rancher Active Proxy/2/rancher-compose.yml
new file mode 100644
index 0000000..328dd6e
--- /dev/null
+++ b/templates/Rancher Active Proxy/2/rancher-compose.yml	
@@ -0,0 +1,23 @@
+.catalog:
+ name: "Initial Version"
+ version: "v0.0.4"
+ questions:    
+    - variable: DEFAULT_HOST
+      label: "Default Virtual Host to use"
+      type: string
+    - variable: DEFAULT_EMAIL
+      label: "Default Email to use for Letsencrypt"
+      default: "info@tstgmbh.com"
+      type: string    
+    - variable: DEFAULT_PORT
+      label: "Default Port to use"
+      default: "80"
+      type: string
+    - variable: CRON
+      label: "Auto renew cron like setup"
+      default: "0 2 * * *"
+      type: string
+    - variable: DEBUG
+      label: "Set to true to enable debug"
+      default: "False"
+      type: string
\ No newline at end of file
diff --git a/templates/Rancher Active Proxy/catalogIcon-RAP.svg b/templates/Rancher Active Proxy/catalogIcon-RAP.svg
new file mode 100644
index 0000000..2d52c42
Binary files /dev/null and b/templates/Rancher Active Proxy/catalogIcon-RAP.svg differ
diff --git a/templates/Rancher Active Proxy/config.yml b/templates/Rancher Active Proxy/config.yml
new file mode 100644
index 0000000..da67d11
--- /dev/null
+++ b/templates/Rancher Active Proxy/config.yml	
@@ -0,0 +1,7 @@
+name: Rancher Active Proxy
+description: "Automatic Active Proxy for Rancher with Let's Encrypt support"
+version: "v0.0.4"
+category: Proxy
+maintainer: AdrienM
+license: MIT
+projectURl: "https://github.com/adi90x/rancher-active-proxy"
\ No newline at end of file
diff --git a/templates/ffrs-webseite/1/docker-compose.yml b/templates/ffrs-webseite/1/docker-compose.yml
new file mode 100644
index 0000000..ae7b0c9
--- /dev/null
+++ b/templates/ffrs-webseite/1/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+
+services:
+
+  website:
+    build: https://github.com/Freifunk-Rhein-Sieg/freifunk-rhein-sieg.net.git
+    volumes:
+      - web:/project
+    labels:
+      io.rancher.container.hostname_override: container_name
+      io.rancher.container.pull_image: always
+      rap.host: ${DOMAIN}
+      rap.le_host: ${DOMAIN}
+      rap.client_max_body_size: "10G"
+
+volumes:
+  web:
+    driver: local
+  zertifikate:
+    driver: local
diff --git a/templates/ffrs-webseite/1/rancher-compose.yml b/templates/ffrs-webseite/1/rancher-compose.yml
new file mode 100644
index 0000000..f19fe9b
--- /dev/null
+++ b/templates/ffrs-webseite/1/rancher-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+
+catalog:
+
+  name: ffrs-website
+  version: 2
+  description: Freifunk Rhein Sieg Webseite
+  questions:
+    - variable: DOMAIN
+      default: freifunk-rhein-sieg.net
+      label: Domain
+      required: true
+      type: string
+
+
+services:
+
+  website:
+    scale: 1
+    start_on_create: true
\ No newline at end of file