diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md
index fd41c053f2..c58692478f 100644
--- a/stable/gocd/CHANGELOG.md
+++ b/stable/gocd/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.1.1
+
+* [ccd0a08d](https://github.com/kubernetes/charts/commit/ccd0a08d): Do not perform preconfigure_server script if server has already been configured
+
 ### 1.1.0
 
 * [31990cd8](https://github.com/kubernetes/charts/commit/31990cd8): Support for ELB SSL using AWS ACM
diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
index 7cf2b4b8ca..f943a214b9 100644
--- a/stable/gocd/Chart.yaml
+++ b/stable/gocd/Chart.yaml
@@ -1,6 +1,6 @@
 name: gocd
 home: https://www.gocd.org/
-version: 1.1.0
+version: 1.1.1
 appVersion: 18.6.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png
diff --git a/stable/gocd/templates/configmap.yaml b/stable/gocd/templates/configmap.yaml
index cc40bf4b95..c4fc52d210 100644
--- a/stable/gocd/templates/configmap.yaml
+++ b/stable/gocd/templates/configmap.yaml
@@ -25,6 +25,16 @@ data:
 
     set -e
 
+    echo "checking if server has already been configured" >> /godata/logs/preconfigure.log
+
+    if [ -f /godata/logs/preconfigure_complete.log ]
+    then
+      echo "Existing server configuration found in cruise-config.xml. Skipping preconfigure_server scripts." >> /godata/logs/preconfigure.log
+      exit 0
+    fi
+
+    echo "No configuration found in cruise-config.xml. Using default preconfigure_server scripts to configure server" >> /godata/logs/preconfigure.log
+
     echo "Trying to create an elastic profile now." >> /godata/logs/preconfigure.log
 
     (curl --fail -i 'http://localhost:8153/go/api/elastic/profiles' \
@@ -130,4 +140,4 @@ data:
            -H 'X-GoCD-Confirm: true' \
            -X POST >> /godata/logs/preconfigure.log)
 
-    echo "Done preconfiguring the GoCD server" >> /godata/logs/preconfigure.log
+    echo "Done preconfiguring the GoCD server" > /godata/logs/preconfigure_complete.log