diff --git a/pom.xml b/pom.xml
old mode 100755
new mode 100644
diff --git a/src/main/java/com/frameworkium/config/DriverSetup.java b/src/main/java/com/frameworkium/config/DriverSetup.java
old mode 100755
new mode 100644
diff --git a/src/main/java/com/frameworkium/config/drivers/ElectronImpl.java b/src/main/java/com/frameworkium/config/drivers/ElectronImpl.java
index 55fca47c..3f07949d 100755
--- a/src/main/java/com/frameworkium/config/drivers/ElectronImpl.java
+++ b/src/main/java/com/frameworkium/config/drivers/ElectronImpl.java
@@ -5,13 +5,18 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
 import static com.frameworkium.config.SystemProperty.APP_PATH;
+import static com.frameworkium.config.SystemProperty.GRID_URL;
 
 public class ElectronImpl extends DriverType {
 
+    private static URL remoteURL;
+
     @Override
     public DesiredCapabilities getDesiredCapabilities() {
         Map<String, String> chromeOptions = new HashMap<>();
@@ -20,9 +25,18 @@ public DesiredCapabilities getDesiredCapabilities() {
         } else {
             chromeOptions.put("binary", APP_PATH.getValue());
         }
-        DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
-        desiredCapabilities.setCapability("host", "localhost");
-        desiredCapabilities.setCapability("port", 9515);
+        try {
+            if (GRID_URL.isSpecified()) {
+                remoteURL = new URL(GRID_URL.getValue());
+            }
+            else {
+                remoteURL = new URL("http://localhost:9515");
+            }
+        }
+        catch(MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+        DesiredCapabilities desiredCapabilities = DesiredCapabilities.chrome();
         desiredCapabilities.setCapability("browserName", "chrome");
         desiredCapabilities.setCapability("chromeOptions", chromeOptions);
         return desiredCapabilities;
@@ -30,7 +44,6 @@ public DesiredCapabilities getDesiredCapabilities() {
 
     @Override
     public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
-        return new RemoteWebDriver(capabilities);
+        return new RemoteWebDriver(remoteURL ,capabilities);
     }
-
 }
diff --git a/src/main/java/com/frameworkium/reporting/AllureProperties.java b/src/main/java/com/frameworkium/reporting/AllureProperties.java
old mode 100755
new mode 100644