diff --git a/templates/autospotting/0/README.md b/infra-templates/autospotting/0/README.md
similarity index 100%
rename from templates/autospotting/0/README.md
rename to infra-templates/autospotting/0/README.md
diff --git a/templates/autospotting/0/docker-compose.yml b/infra-templates/autospotting/0/docker-compose.yml
similarity index 100%
rename from templates/autospotting/0/docker-compose.yml
rename to infra-templates/autospotting/0/docker-compose.yml
diff --git a/templates/autospotting/0/rancher-compose.yml b/infra-templates/autospotting/0/rancher-compose.yml
similarity index 100%
rename from templates/autospotting/0/rancher-compose.yml
rename to infra-templates/autospotting/0/rancher-compose.yml
diff --git a/templates/autospotting/catalogIcon-autospotting.svg b/infra-templates/autospotting/catalogIcon-auttospotting.svg
similarity index 100%
rename from templates/autospotting/catalogIcon-autospotting.svg
rename to infra-templates/autospotting/catalogIcon-auttospotting.svg
diff --git a/templates/autospotting/config.yml b/infra-templates/autospotting/config.yml
similarity index 100%
rename from templates/autospotting/config.yml
rename to infra-templates/autospotting/config.yml
diff --git a/infra-templates/aws-spot-instance-helper/0/README.md b/infra-templates/aws-spot-instance-helper/0/README.md
new file mode 100644
index 0000000..36f22f1
--- /dev/null
+++ b/infra-templates/aws-spot-instance-helper/0/README.md
@@ -0,0 +1,7 @@
+# AWS Spot Instance Helper
+
+### Info
+This is a simple service that runs globally. It monitors the state of the host, if the host is running on a spot instance it will check to see if the host is scheduled for termination then it will automatically deactive the host and evaculate the containers.
+
+The source code is available at [https://www.github.com/chrisurwin/aws-spot-instance-helper](https://www.github.com/chrisurwin/aws-spot-instance-helper)
+
diff --git a/infra-templates/aws-spot-instance-helper/0/docker-compose.yml b/infra-templates/aws-spot-instance-helper/0/docker-compose.yml
new file mode 100644
index 0000000..d88c501
--- /dev/null
+++ b/infra-templates/aws-spot-instance-helper/0/docker-compose.yml
@@ -0,0 +1,8 @@
+aws-spot-instance-helper:
+  image: chrisurwin/aws-spot-instance-helper:v0.1.0
+  tty: true
+  labels:
+    io.rancher.container.create_agent: 'true'
+    io.rancher.container.agent.role: environment
+    io.rancher.container.pull_image: always
+    io.rancher.scheduler.global: 'true'
\ No newline at end of file
diff --git a/infra-templates/aws-spot-instance-helper/0/rancher-compose.yml b/infra-templates/aws-spot-instance-helper/0/rancher-compose.yml
new file mode 100644
index 0000000..a98b942
--- /dev/null
+++ b/infra-templates/aws-spot-instance-helper/0/rancher-compose.yml
@@ -0,0 +1,16 @@
+.catalog:
+    name: "AWS Spot Instance Helper"
+    version: "v0.1.0"
+    description: "AWS Spot Instance Helper"
+    minimum_rancher_version: v1.5.5
+
+ 
+aws-spot-instance-helper:
+    health_check:
+        port: 9777
+        interval: 2000
+        unhealthy_threshold: 3
+        strategy: recreate
+        response_timeout: 2000
+        request_line: GET /ping HTTP/1.0
+        healthy_threshold: 2
\ No newline at end of file
diff --git a/infra-templates/aws-spot-instance-helper/catalogIcon-rahc.svg b/infra-templates/aws-spot-instance-helper/catalogIcon-rahc.svg
new file mode 100644
index 0000000..b585445
--- /dev/null
+++ b/infra-templates/aws-spot-instance-helper/catalogIcon-rahc.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1200.000000pt" height="1200.000000pt" viewBox="0 0 1200.000000 1200.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,1200.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M0 6000 l0 -6000 6000 0 6000 0 0 6000 0 6000 -6000 0 -6000 0 0
+-6000z m6369 5085 c174 -42 319 -177 377 -355 17 -50 18 -112 22 -717 l3 -663
+-1798 0 c-1983 0 -1850 4 -1977 -63 -118 -61 -226 -200 -255 -327 -7 -30 -11
+-651 -11 -1882 l0 -1838 -602 0 c-368 0 -628 4 -667 11 -228 37 -401 216 -432
+447 -6 51 -9 910 -7 2527 l3 2450 23 66 c43 129 132 234 250 297 121 64 -55
+60 2592 61 2121 1 2423 -1 2479 -14z m2142 -2183 c164 -46 299 -177 349 -340
+19 -61 20 -94 20 -728 l0 -664 -1804 0 c-1771 0 -1805 0 -1868 -20 -161 -50
+-286 -176 -344 -350 -18 -53 -19 -133 -22 -1892 l-2 -1838 -628 0 c-684 0
+-689 0 -796 58 -28 15 -81 57 -119 93 -78 78 -130 177 -147 279 -14 90 -14
+4900 0 4990 30 189 188 365 371 414 46 13 394 15 2489 15 2331 1 2438 0 2501
+-17z m2160 -2190 c82 -27 175 -88 230 -150 50 -57 105 -167 119 -241 15 -79
+14 -4962 -1 -5033 -40 -192 -212 -361 -404 -398 -44 -8 -715 -10 -2490 -8
+l-2430 3 -58 22 c-150 57 -263 170 -320 320 l-22 58 -3 2495 c-1 1709 1 2511
+8 2546 43 209 223 375 435 404 33 4 1142 7 2465 6 l2405 -1 66 -23z"/>
+</g>
+</svg>
diff --git a/infra-templates/aws-spot-instance-helper/config.yml b/infra-templates/aws-spot-instance-helper/config.yml
new file mode 100644
index 0000000..1457c2a
--- /dev/null
+++ b/infra-templates/aws-spot-instance-helper/config.yml
@@ -0,0 +1,5 @@
+name: AWS Spot Instance Helper
+description: |
+  Automatically evacuates spot instances that are marked for termination
+version: v0.1.0
+category: Rancher Services
\ No newline at end of file