diff --git a/README.md b/README.md
index 2f80dc05..3f75808a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Selenium-Maven-Template
 
 [![Join the chat at https://gitter.im/Ardesco/Selenium-Maven-Template](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Ardesco/Selenium-Maven-Template?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-A maven template for Selenium that has the latest dependencies so that you can just check out and start writing tests in four easy steps.  If you like what you see have a look at my Selenium book [Mastering Selenium Webdriver](https://www.amazon.co.uk/Mastering-Selenium-WebDriver-Mark-Collin/dp/1784394351).
+A maven template for Selenium 3 that has the latest dependencies so that you can just check out and start writing tests in four easy steps.  If you like what you see have a look at my Selenium book [Mastering Selenium Webdriver](https://www.amazon.co.uk/Mastering-Selenium-WebDriver-Mark-Collin/dp/1784394351).
 
 
 1. Open a terminal window/command prompt
diff --git a/pom.xml b/pom.xml
index 58b35ba7..572d63f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <selenium.version>3.0.0-beta2</selenium.version>
+        <selenium.version>3.0.0</selenium.version>
         <overwrite.binaries>false</overwrite.binaries>
         <browser>firefox</browser>
         <threads>1</threads>
@@ -59,6 +59,18 @@
             <artifactId>hamcrest-all</artifactId>
             <version>1.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>${selenium.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.detro.ghostdriver</groupId>
+                    <artifactId>phantomjsdriver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
diff --git a/src/test/resources/RepositoryMap.xml b/src/test/resources/RepositoryMap.xml
index a8bf4336..d98c3584 100644
--- a/src/test/resources/RepositoryMap.xml
+++ b/src/test/resources/RepositoryMap.xml
@@ -55,10 +55,15 @@
             </version>
         </driver>
         <driver id="marionette">
-            <version id="0.10.0">
+            <version id="0.11.1">
                 <bitrate sixtyfourbit="true">
-                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-win64.zip</filelocation>
-                    <hash>babc51b39da6f9a090c3c0e3ab9e800086f6140c</hash>
+                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-win64.zip</filelocation>
+                    <hash>c41ef7cbfa9a8039b0918073bbe56316fa906e83</hash>
+                    <hashtype>sha1</hashtype>
+                </bitrate>
+                <bitrate thirtytwobit="true">
+                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-win32.zip</filelocation>
+                    <hash>b088e6ba6d99d78a007c0a45bd33088f72eadebc</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>
@@ -120,10 +125,15 @@
             </version>
         </driver>
         <driver id="marionette">
-            <version id="0.10.0">
+            <version id="0.11.1">
+                <bitrate sixtyfourbit="true">
+                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux64.tar.gz</filelocation>
+                    <hash>a8bff7a660e5ca5b1a5e7b8040b32c8e551da5ef</hash>
+                    <hashtype>sha1</hashtype>
+                </bitrate>
                 <bitrate sixtyfourbit="true">
-                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-linux64.tar.gz</filelocation>
-                    <hash>7dd33d2779aedaca41f94dee2f1db6a25d9230a2</hash>
+                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux32.tar.gz</filelocation>
+                    <hash>c215849513421018fbc59d52f9ed4575c99c6b38</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>
@@ -165,10 +175,10 @@
             </version>
         </driver>
         <driver id="marionette">
-            <version id="0.10.0">
+            <version id="0.11.1">
                 <bitrate thirtytwobit="true" sixtyfourbit="true">
-                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-macos.tar.gz</filelocation>
-                    <hash>ca22ac7a159bc81f2e2f35fd29ccd6693a81b763</hash>
+                    <filelocation>https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-macos.tar.gz</filelocation>
+                    <hash>cec3a1bfd6717ec853058316a508e701b3fda57d</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>