diff --git a/templates/selenium/0/docker-compose.yml.tpl b/templates/selenium/0/docker-compose.yml.tpl
index 04ece7c..ce05a23 100644
--- a/templates/selenium/0/docker-compose.yml.tpl
+++ b/templates/selenium/0/docker-compose.yml.tpl
@@ -1,28 +1,20 @@
 version: '2'
 services:
-  {{- if eq .Values.DEPLOY_SELENIUM_HUB "true"}}
   seleniumhub:
-    image: selenium/hub:${SELENIUM_HUB_VERSION}
+    image: selenium/hub:${SELENIUM_VERSION}
     environment:
       GRID_TIMEOUT: ${GRID_TIMEOUT}
     ports:
       - ${PUBLISH_PORT}:4444
-    labels:
-      io.rancher.container.pull_image: always
-  {{- end}}
   {{- if eq .Values.DEPLOY_SELENIUM_CHROME "true"}}
   selenium-chrome:
-    image: selenium/node-chrome:${SELENIUM_CHROME_VERSION}
+    image: selenium/node-chrome:${SELENIUM_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}
+    image: selenium/node-firefox:${SELENIUM_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 2d46b2e..fbb89a2 100644
--- a/templates/selenium/0/rancher-compose.yml
+++ b/templates/selenium/0/rancher-compose.yml
@@ -4,20 +4,12 @@ catalog:
   version: v0.0.1
   minimum_rancher_version: v1.5.0
   questions:
-    - variable: DEPLOY_SELENIUM_HUB
-      description: Deploy Selenium Hub
-      label: Deploy Selenium Hub
-      required: true
-      type: enum
-      default: true
-      options:
-        - true
-        - false
-    - variable: SELENIUM_HUB_VERSION
-      label: Selenium Hub Version
-      description: Selenium Hub Version
+    - variable: SELENIUM_VERSION
+      label: Selenium Version for Hub and Nodes
+      description: Selenium Hub and Node Version
       required: true
       type: enum
+      default: 3.8.1-bohrium
       options:
         - 3.8.1-bohrium
         - 3.8.1-aluminum
@@ -58,32 +50,6 @@ catalog:
       options:
         - true
         - false
-    - 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_CHROME_SCALE
       label: Number of chrome container
       description: Number of chrome container
@@ -98,32 +64,6 @@ catalog:
       options:
         - true
         - false
-    - variable: SELENIUM_FIREFOX_VERSION
-      label: Selenium Firefox Version
-      description: Selenium Firefox 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_SCALE
       label: Number of firefox container
       description: Number of firefox container