diff --git a/kubernetes/gke/maestro-client/external-svc.yaml b/kubernetes/gke/maestro-client/external-svc.yaml
index 49a5469..119c4a0 100644
--- a/kubernetes/gke/maestro-client/external-svc.yaml
+++ b/kubernetes/gke/maestro-client/external-svc.yaml
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
+apiVersion: v1
+kind: Service
 metadata:
   name: external-client
 spec:
-  backend:
-    serviceName: internal-client
-    servicePort: pi-client
+  selector:
+    app: maestro-client
+  type: LoadBalancer
+  ports:
+  - port: 80
+    targetPort: mclient-port
\ No newline at end of file
diff --git a/kubernetes/gke/maestro-client/maestro-client.yaml b/kubernetes/gke/maestro-client/maestro-client.yaml
index 4c3dbe2..12a6116 100644
--- a/kubernetes/gke/maestro-client/maestro-client.yaml
+++ b/kubernetes/gke/maestro-client/maestro-client.yaml
@@ -17,10 +17,10 @@ spec:
           containerPort: 80
         env:
         - name: API_URL
-          value: "http://localhost:31241"
+          value: "//api.maestroserver.io"
         - name: STATIC_URL
-          value: "http://localhost:31241/static/"
+          value: "https://s3.amazonaws.com/awsmaestro/"
         - name: ANALYTICS_URL
-          value: "http://localhost:31299"
+          value: "//graphs.maestroserver.io"
         - name: WEBSOCKET_URL
-          value: "ws://localhost:31800"
+          value: "wss://webscoket.maestroserver.io:8443"
diff --git a/kubernetes/gke/maestro-server/maestro-server.yaml b/kubernetes/gke/maestro-server/maestro-server.yaml
index c21460f..481ec51 100644
--- a/kubernetes/gke/maestro-server/maestro-server.yaml
+++ b/kubernetes/gke/maestro-server/maestro-server.yaml
@@ -34,10 +34,51 @@ spec:
           - name: MAESTRO_ANALYTICS_FRONT_URI
             value: "http://internal-analytics-front:9999"
           - name: SMTP_PORT
-            value: "25"
+            valueFrom:
+              secretKeyRef:
+                name: smtp
+                key: SMTP_PORT
           - name: SMTP_HOST
-            value: "internal-maildev"
+            valueFrom:
+              secretKeyRef:
+                name: smtp
+                key: SMTP_HOST
           - name: SMTP_SENDER
-            value: "myemail@gmail.com"
-          - name: SMTP_IGNORE
-            value: "true"
\ No newline at end of file
+            valueFrom:
+              secretKeyRef:
+                name: smtp
+                key: SMTP_SENDER
+          - name: SMTP_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: smtp
+                key: SMTP_USERNAME
+          - name: SMTP_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: smtp
+                key: SMTP_PASSWORD
+          - name: SMTP_USETSL
+            value: "true"
+          - name: MAESTRO_UPLOAD_TYPE
+            value: "S3"
+          - name: AWS_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: storage
+                key: AWS_ACCESS_KEY_ID
+          - name: AWS_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: storage
+                key: AWS_SECRET_ACCESS_KEY
+          - name: AWS_S3_BUCKET_NAME
+            valueFrom:
+              secretKeyRef:
+                name: storage
+                key: AWS_S3_BUCKET_NAME
+          - name: AWS_DEFAULT_REGION
+            valueFrom:
+              secretKeyRef:
+                name: storage
+                key: AWS_DEFAULT_REGION
\ No newline at end of file
diff --git a/kubernetes/gke/secrets/smtp.txt b/kubernetes/gke/secrets/smtp.txt
new file mode 100644
index 0000000..de7a60d
--- /dev/null
+++ b/kubernetes/gke/secrets/smtp.txt
@@ -0,0 +1,6 @@
+SMTP_PORT=
+SMTP_HOST=
+SMTP_SENDER=
+SMTP_USERNAME=
+SMTP_PASSWORD=
+SMTP_USETSL=
\ No newline at end of file
diff --git a/kubernetes/gke/secrets/storage.txt b/kubernetes/gke/secrets/storage.txt
new file mode 100644
index 0000000..9abb996
--- /dev/null
+++ b/kubernetes/gke/secrets/storage.txt
@@ -0,0 +1,5 @@
+MAESTRO_UPLOAD_TYPE=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=
+AWS_S3_BUCKET_NAME=
\ No newline at end of file