diff --git a/elasticsearch/examples/openshift/Makefile b/elasticsearch/examples/openshift/Makefile
new file mode 100644
index 000000000..6e495916d
--- /dev/null
+++ b/elasticsearch/examples/openshift/Makefile
@@ -0,0 +1,15 @@
+default: test
+include ../../../helpers/examples.mk
+
+RELEASE := elasticsearch
+
+template:
+	helm template --values ./values.yaml ../../
+
+install:
+	helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
+
+test: install goss
+
+purge:
+	helm del --purge $(RELEASE)
diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
new file mode 100644
index 000000000..275754bb3
--- /dev/null
+++ b/elasticsearch/examples/openshift/test/goss.yaml
@@ -0,0 +1,17 @@
+http:
+  http://localhost:9200/_cluster/health:
+    status: 200
+    timeout: 2000
+    body:
+      - 'green'
+      - '"number_of_nodes":3'
+      - '"number_of_data_nodes":3'
+
+  http://localhost:9200:
+    status: 200
+    timeout: 2000
+    body:
+      - '"number" : "7.3.0"'
+      - '"cluster_name" : "elasticsearch"'
+      - '"name" : "elasticsearch-master-0"'
+      - 'You Know, for Search'
diff --git a/elasticsearch/examples/openshift/values.yaml b/elasticsearch/examples/openshift/values.yaml
new file mode 100644
index 000000000..7f5cd8494
--- /dev/null
+++ b/elasticsearch/examples/openshift/values.yaml
@@ -0,0 +1,10 @@
+---
+
+securityContext:
+  runAsUser: null
+
+podSecurityContext:
+  fsGroup: null
+
+sysctlInitContainer:
+  enabled: false
diff --git a/kibana/examples/openshift/Makefile b/kibana/examples/openshift/Makefile
new file mode 100644
index 000000000..9dccc65ed
--- /dev/null
+++ b/kibana/examples/openshift/Makefile
@@ -0,0 +1,15 @@
+default: test
+include ../../../helpers/examples.mk
+
+RELEASE := kibana
+
+template:
+	helm template --values ./values.yml ../../
+
+install: 
+	helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../
+
+test: install goss
+	
+purge:
+	helm del --purge $(RELEASE)
diff --git a/kibana/examples/openshift/test/goss.yaml b/kibana/examples/openshift/test/goss.yaml
new file mode 100644
index 000000000..35aee7dd4
--- /dev/null
+++ b/kibana/examples/openshift/test/goss.yaml
@@ -0,0 +1,4 @@
+http:
+  http://localhost:5601/app/kibana:
+    status: 200
+    timeout: 2000
diff --git a/kibana/examples/openshift/values.yml b/kibana/examples/openshift/values.yml
new file mode 100644
index 000000000..558306fdc
--- /dev/null
+++ b/kibana/examples/openshift/values.yml
@@ -0,0 +1,7 @@
+---
+
+podSecurityContext:
+  fsGroup: null
+
+securityContext:
+  runAsUser: null