diff --git a/logstash/examples/6.x/Makefile b/logstash/examples/6.x/Makefile
index dc2fe7471..b44d6b24d 100644
--- a/logstash/examples/6.x/Makefile
+++ b/logstash/examples/6.x/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-six
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE)  --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE)  --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
 
 test: install goss
 
diff --git a/logstash/examples/6.x/test/goss.yaml b/logstash/examples/6.x/test/goss.yaml
index c73a5ce55..c868315c4 100644
--- a/logstash/examples/6.x/test/goss.yaml
+++ b/logstash/examples/6.x/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true
diff --git a/logstash/examples/default/Makefile b/logstash/examples/default/Makefile
index 837b94061..03d9592f1 100644
--- a/logstash/examples/default/Makefile
+++ b/logstash/examples/default/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-default
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE) ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
 
 test: install goss
 
diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml
index c85061353..9021b3a48 100644
--- a/logstash/examples/default/test/goss.yaml
+++ b/logstash/examples/default/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true
diff --git a/logstash/examples/elasticsearch/Makefile b/logstash/examples/elasticsearch/Makefile
index 1b52368eb..f78c42f4e 100644
--- a/logstash/examples/elasticsearch/Makefile
+++ b/logstash/examples/elasticsearch/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-elasticsearch
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
 
 test: install goss
 
diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml
index aa90a363b..1da06720d 100644
--- a/logstash/examples/elasticsearch/test/goss.yaml
+++ b/logstash/examples/elasticsearch/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 mount:
   /usr/share/logstash/data:
     exists: true
diff --git a/logstash/examples/oss/Makefile b/logstash/examples/oss/Makefile
index 17c4c1fb3..856234431 100644
--- a/logstash/examples/oss/Makefile
+++ b/logstash/examples/oss/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-oss
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE)  --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE)  --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
 
 test: install goss
 
diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml
index f4ffbc5db..c98dd8fe3 100644
--- a/logstash/examples/oss/test/goss.yaml
+++ b/logstash/examples/oss/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true