diff --git a/templates/secrets-bridge-agents/0/README.md b/templates/secrets-bridge-agents/0/README.md
new file mode 100644
index 0000000..9a34e60
--- /dev/null
+++ b/templates/secrets-bridge-agents/0/README.md
@@ -0,0 +1,16 @@
+## Secrets Bridge Agents (Experimental)
+---
+###Status: Experimental POC (Read: Do NOT use for production)
+Only works with Hashicorp Vault server in dev mode currently.
+
+---
+#### Description:
+ This is the agent component for the Vault secrets bridge with Rancher. This service will be deployed in the environment running applications that need secrets. This service does not have direct access to Vault, it communicates with the Secrets Bridge server.
+
+#### Pre-reqs:
+
+An instance of Secrets Bridge server running.
+
+#### Running this app
+As services come up, this service will send events to the Secrets Bridge based on Docker start events. The server will (Not currently enforced) verify the signed token with Rancher server and get the launching containers Rancher environment, stack, service and Docker ID. With that information the Secrets Bridge server will check with Vault in the `configPath/environment/stack/service/container_name` for a key called policies. It checks from most specific and recursively looks down to the environment key. It uses the most specific match.
+
diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml
new file mode 100644
index 0000000..9a4b921
--- /dev/null
+++ b/templates/secrets-bridge-agents/0/docker-compose.yml
@@ -0,0 +1,10 @@
+secrets-bridge:
+ image: rancher/secrets-bridge:v0.0.2
+ command: agent --bridge-url ${BRIDGE_URL}
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ privileged: true
+ labels:
+ io.rancher.container.create_agent: true
+ io.rancher.container.agent.role: agent
+ io.rancher.scheduler.global: true
diff --git a/templates/secrets-bridge-agents/0/rancher-compose.yml b/templates/secrets-bridge-agents/0/rancher-compose.yml
new file mode 100644
index 0000000..be5c3eb
--- /dev/null
+++ b/templates/secrets-bridge-agents/0/rancher-compose.yml
@@ -0,0 +1,11 @@
+.catalog:
+ name: "Secrets Bridge Agent"
+ version: 0.0.1-rancher1
+ description: |
+ Agent side of secrets bridge between Rancher and Vault
+ questions:
+ - variable: BRIDGE_URL
+ type: string
+ label: "Secrets Bridge URL"
+ required: true
+ description: "Should be the http(s)://address:port version of the url"
diff --git a/templates/secrets-bridge-agents/catalogIcon-secrets-bridge.svg b/templates/secrets-bridge-agents/catalogIcon-secrets-bridge.svg
new file mode 100644
index 0000000..776c20c
--- /dev/null
+++ b/templates/secrets-bridge-agents/catalogIcon-secrets-bridge.svg
@@ -0,0 +1,150 @@
+
+
+
diff --git a/templates/secrets-bridge-agents/config.yml b/templates/secrets-bridge-agents/config.yml
new file mode 100644
index 0000000..3c30e4d
--- /dev/null
+++ b/templates/secrets-bridge-agents/config.yml
@@ -0,0 +1,4 @@
+name: "Secrets Bridge Agents"
+description: "Agent side of bridge between Vault and Rancher"
+version: "0.0.1-rancher1"
+category: Security
diff --git a/templates/secrets-bridge-server/0/README.md b/templates/secrets-bridge-server/0/README.md
new file mode 100644
index 0000000..b35e541
--- /dev/null
+++ b/templates/secrets-bridge-server/0/README.md
@@ -0,0 +1,55 @@
+## Secrets Bridge Server (Experimental)
+---
+###Status: Experimental POC (Read: Do NOT use for production)
+Only works with Hashicorp Vault server in dev mode currently.
+
+---
+#### Description:
+ This is the server side component for the Vault Secrets bridge with Rancher. This service should *NOT* be deployed in the same environment as user applications. It will have access to Vault, and compromising it will give the person access to *ALL* secrets available in that environment. It should instead be run in an environment reserved for the team operating Rancher.
+
+ The reason this uses a temporary Cubbyhole token to start the service is that ENV variables do show up in the Rancher API and Docker inspect commands.
+
+#### Pre-reqs:
+
+A Vault server in Dev mode.
+
+Create Vault Policies and Roles for at least the Issuing token.
+Something like:
+
+```
+ vault policy-write grantor-Default ./policies/grantor-Default
+ vault policy-write test1 ./policies/test1
+ vault policy-write test2 ./policies/test2
+```
+
+
+```
+curl -s -X POST -H "X-Vault-Token: ${VAULT_TOKEN}" -d '{"allowed_policies": "default,grantor,test1,test2"}' http://vault/v1/auth/token/roles/grantor-Default
+```
+
+#### Configure and Launch:
+ 1. Create a token to be used to issue new tokens in the environment. As part of the "meta" on the token add a field called `configPath` and set that equal to a path in the secrets folder in Vault. (like `/secrets/secrets-bridge/Default`)
+
+
+ ```
+curl -s -X POST -H "X-Vault-Token: $ROOT_TOKEN" ${VAULT_URL}/v1/auth/token/create/grantor-Default -d '{"policies": ["default", "grantor", "test1", "test2"], "ttl": "72h", "meta": {"configPath": "secret/secrets-bridge/Default"}}' | jq -r '.auth.client_token'
+ ```
+
+
+ 2. Create a temporary token with (2) uses.
+
+ ```
+ curl -s -H "X-Vault-Token: $ROOT_TOKEN" ${VAULT_URL}/v1/auth/token/create -d '{"policies": ["default"], "ttl": "15m", "num_uses": 2}'|jq -r '.auth.client_token'
+ ```
+
+ 3. Use the temporary token to put the issuing token into the Vault cubbyhole.
+
+ ```
+ curl -X POST -H "X-Vault-Token: ${TEMP_TOKEN}" ${VAULT_URL}/v1/cubbyhole/Default -d "{\"permKey\": \"${PERM_TOKEN}\"}"
+ ```
+
+ 4. Create Cattle API keys for the environment this server will be handling. (Would recommend 1 server per environment)
+
+ 5. Launch this app with all of the configs.
+
+
diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml
new file mode 100644
index 0000000..5183e49
--- /dev/null
+++ b/templates/secrets-bridge-server/0/docker-compose.yml
@@ -0,0 +1,18 @@
+secrets-bridge:
+ image: rancher/secrets-bridge:v0.0.2
+ environment:
+ CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY}
+ CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY}
+ CATTLE_URL: ${CATTLE_URL}
+ VAULT_TOKEN: ${VAULT_TOKEN}
+ VAULT_CUBBYPATH: ${VAULT_CUBBYPATH}
+ command:
+ - server
+ - --vault-url
+ - ${VAULT_URL}
+ - --rancher-url
+ - $CATTLE_URL
+ - --rancher-secret
+ - ${CATTLE_SECRET_KEY}
+ - --rancher-access
+ - ${CATTLE_ACCESS_KEY}
diff --git a/templates/secrets-bridge-server/0/rancher-compose.yml b/templates/secrets-bridge-server/0/rancher-compose.yml
new file mode 100644
index 0000000..eb2116a
--- /dev/null
+++ b/templates/secrets-bridge-server/0/rancher-compose.yml
@@ -0,0 +1,36 @@
+.catalog:
+ name: "Secrets Bridge Server"
+ version: 0.0.1-rancher1
+ description: |
+ Server side secrets bridge between Rancher and Vault
+ questions:
+ - variable: CATTLE_URL
+ type: string
+ label: "Cattle URL"
+ required: true
+ description: "URL to the Cattle Project this service is managing"
+ - variable: CATTLE_ACCESS_KEY
+ type: string
+ label: "Cattle Access Key"
+ required: true
+ description: "Cattle Access API Key"
+ - variable: CATTLE_SECRET_KEY
+ type: password
+ label: "Cattle Secret Key"
+ required: true
+ description: "Cattle Secret API Key"
+ - variable: VAULT_TOKEN
+ type: password
+ label: "Vault Temp Token"
+ required: true
+ description: "Temporary Token to Access Vault Cubbyhole"
+ - variable: VAULT_URL
+ type: string
+ label: "URL to Vault server"
+ required: true
+ description: "URL to the Vault server"
+ - variable: VAULT_CUBBYPATH
+ type: string
+ label: "Vault Cubbyhole Path"
+ required: true
+ description: "Path to get the permenant API key"
diff --git a/templates/secrets-bridge-server/catalogIcon-secrets-bridge.svg b/templates/secrets-bridge-server/catalogIcon-secrets-bridge.svg
new file mode 100644
index 0000000..776c20c
--- /dev/null
+++ b/templates/secrets-bridge-server/catalogIcon-secrets-bridge.svg
@@ -0,0 +1,150 @@
+
+
+
diff --git a/templates/secrets-bridge-server/config.yml b/templates/secrets-bridge-server/config.yml
new file mode 100644
index 0000000..d9e4c7f
--- /dev/null
+++ b/templates/secrets-bridge-server/config.yml
@@ -0,0 +1,4 @@
+name: "Secrets Bridge"
+description: "Server side of bridge between Vault and Rancher"
+version: "0.0.1-rancher1"
+category: Security