diff --git a/templates/selenium/0/docker-compose.yml b/templates/selenium/0/docker-compose.yml
deleted file mode 100644
index eed4021..0000000
--- a/templates/selenium/0/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '2'
-services:
-  seleniumhub:
-    image: selenium/hub:${SELENIUM_VERSION}
-    environment:
-      GRID_TIMEOUT: '300000'
-    labels:
-      io.rancher.container.pull_image: always
diff --git a/templates/selenium/0/docker-compose.yml.tpl b/templates/selenium/0/docker-compose.yml.tpl
new file mode 100644
index 0000000..3215870
--- /dev/null
+++ b/templates/selenium/0/docker-compose.yml.tpl
@@ -0,0 +1,26 @@
+version: '2'
+services:
+  {{- if eq .Values.DEPLOY_SELENIUM_HUB "true"}}
+  seleniumhub:
+    image: selenium/hub:${SELENIUM_HUB_VERSION}
+    environment:
+      GRID_TIMEOUT: ${GRID_TIMEOUT}
+    labels:
+      io.rancher.container.pull_image: always
+  {{- end}}
+  {{- if eq .Values.DEPLOY_SELENIUM_CHROME "true"}}
+  selenium-chrome:
+    image: selenium/node-chrome:${SELENIUM_CHROME_VERSION}
+    links:
+    - seleniumhub:hub
+    labels:
+      io.rancher.container.pull_image: always
+  {{- end}}
+  {{- if eq .Values.DEPLOY_SELENIUM_FIREFOX "true"}}
+  selenium-firefox:
+    image: selenium/node-firefox:${SELENIUM_FIREFOX_VERSION}
+    links:
+    - seleniumhub:hub
+    labels:
+      io.rancher.container.pull_image: always
+  {{- end}}
diff --git a/templates/selenium/0/rancher-compose.yml b/templates/selenium/0/rancher-compose.yml
index 679b871..65908b5 100644
--- a/templates/selenium/0/rancher-compose.yml
+++ b/templates/selenium/0/rancher-compose.yml
@@ -1,12 +1,97 @@
 version: '2'
 catalog:
   name: selenium
-  version: 3.8.1-bohrium
+  version: 0
   minimum_rancher_version: v1.5.0
   questions:
-    - variable: "SELENIUM_VERSION"
-      label:
-      description: |
+    - variable: DEPLOY_SELENIUM_HUB
+      description: Deploy Selenium Hub
+      label: Deploy Selenium Hub
+      required: true
+      type: enum
+      default: true
+      options:
+        - true
+        - false
+    - variable: DEPLOY_SELENIUM_CHROME
+      description: Deploy Selenium Chrome Node
+      label: Deploy Selenium Chrome Node
+      required: true
+      type: enum
+      default: true
+      options:
+        - true
+        - false
+    - variable: DEPLOY_SELENIUM_FIREFOX
+      description: Deploy Selenium Firefox Node
+      label: Deploy Selenium Firefox Node
+      required: true
+      type: enum
+      default: true
+      options:
+        - true
+        - false
+    - variable: SELENIUM_HUB_VERSION
+      label: Selenium Hub Version
+      description: Selenium Hub Version
+      required: true
+      type: enum
+      options:
+        - 3.8.1-bohrium
+        - 3.8.1-aluminum
+        - 3.7.1-cadmium
+        - 3.7.1-beryllium
+        - 3.7.1-argon
+        - 3.7.0-arsenic
+        - 3.6.0-darmstadtium
+        - 3.6.0-copper
+        - 3.6.0-bromine
+        - 3.6.0-americium
+        - 3.5.3-boron
+        - 3.5.3-astatine
+        - 3.5.2-antimony
+        - 3.5.1-aluminum
+        - 3.5.0-argon
+        - 3.4.0-francium
+        - 3.4.0-einsteinium
+        - 3.4.0-dysprosium
+        - 3.4.0-chromium
+        - 3.4.0-bismuth
+    - variable: GRID_TIMEOUT
+      label: Hub Configuration
+      description: Grid Timeout (in seconds)
+      type: int
+      default: 30
+    - variable: SELENIUM_CHROME_VERSION
+      label: Selenium Chrome Version
+      description: Selenium Chrome Version
+      required: true
+      type: enum
+      options:
+        - 3.8.1-bohrium
+        - 3.8.1-aluminum
+        - 3.7.1-cadmium
+        - 3.7.1-beryllium
+        - 3.7.1-argon
+        - 3.7.0-arsenic
+        - 3.6.0-darmstadtium
+        - 3.6.0-copper
+        - 3.6.0-bromine
+        - 3.6.0-americium
+        - 3.5.3-boron
+        - 3.5.3-astatine
+        - 3.5.2-antimony
+        - 3.5.1-aluminum
+        - 3.5.0-argon
+        - 3.4.0-francium
+        - 3.4.0-einsteinium
+        - 3.4.0-dysprosium
+        - 3.4.0-chromium
+        - 3.4.0-bismuth
+    - variable: SELENIUM_FIREFOX_VERSION
+      label: Selenium Firefox Version
+      description: Selenium Firefox Version
+      required: true
       type: enum
       options:
         - 3.8.1-bohrium