diff --git a/plugin/build.gradle b/plugin/build.gradle
index a6fde06..2c7a9a3 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id 'java-library'
    id 'com.adarshr.test-logger' version '4.0.0'
    id "com.redpillanalytics.gradle-properties" version "1.0.8"
-   id 'com.fuseanalytics.gradle.s3' version '1.2.3'
+   id 'com.fuseanalytics.gradle.s3' version '1.2.4'
 }
 
 java {
diff --git a/plugin/src/main/groovy/io/github/stewartbryson/SnowConfig.groovy b/plugin/src/main/groovy/io/github/stewartbryson/SnowConfig.groovy
index 9566402..e7d70af 100644
--- a/plugin/src/main/groovy/io/github/stewartbryson/SnowConfig.groovy
+++ b/plugin/src/main/groovy/io/github/stewartbryson/SnowConfig.groovy
@@ -82,13 +82,13 @@ class SnowConfig {
       ini.get(connectionName).each { key, value ->
          props."${key.replaceAll(/name$/, '')}" = value
       }
+
+      // Remove surrounding quotes from properties values
+      props = props.collectEntries { k, v -> [k, v.replaceAll(/^\"|\"$/, "")] }
+
       // construct url from account
       props.url = "https://" + props.account + ".snowflakecomputing.com"
       props.remove("account")
-      // special password handling to support quoted values
-      props.password = props.password.toString().replaceAll(/("*)([^"$]+)("*)/) { all, q1, pwd, q2 ->
-         pwd
-      }
 
       // we need at least these three to make a connection
       if (!props.url || !props.user || !props.password) {