diff --git a/VERSION b/VERSION
index 5a9560e05..fd2726c91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.11.0-dev
+v0.11.0
diff --git a/cli/command/cluster/bootstrap.go b/cli/command/cluster/bootstrap.go
index d339cfabe..83595f43d 100644
--- a/cli/command/cluster/bootstrap.go
+++ b/cli/command/cluster/bootstrap.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	bootstrapImg = "appcelerator/amp-bootstrap:%s"
-	bootstrapTag = "0.10.1"
+	bootstrapTag = "0.11.0"
 )
 
 var (
diff --git a/cli/command/cluster/create.go b/cli/command/cluster/create.go
index 7eef6e259..e858ba022 100644
--- a/cli/command/cluster/create.go
+++ b/cli/command/cluster/create.go
@@ -24,7 +24,7 @@ func NewCreateCommand(c cli.Interface) *cobra.Command {
 	flags.IntVarP(&opts.managers, "managers", "m", 3, "Intial number of manager nodes")
 	flags.StringVar(&opts.provider, "provider", "local", "Cluster provider")
 	flags.StringVar(&opts.name, "name", "", "Cluster Label")
-	flags.StringVarP(&opts.tag, "tag", "t", "0.10.1", "Specify tag for cluster images (default is '0.10.1', use 'local' for development)")
+	flags.StringVarP(&opts.tag, "tag", "t", "0.11.0", "Specify tag for cluster images (default is '0.11.0', use 'local' for development)")
 	flags.StringVarP(&opts.registration, "registration", "r", configuration.RegistrationNone, "Specify the registration policy (default is 'none', possible values are 'none' or 'email')")
 	flags.BoolVarP(&opts.notifications, "notifications", "n", false, "Enable/disable server notifications (default is 'false')")
 	return cmd
diff --git a/platform/build b/platform/build
index eafa824bb..2eb496ecd 100755
--- a/platform/build
+++ b/platform/build
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-TAGS=( latest 0.10.1 )
+TAGS=( latest 0.11.0 )
 OWNER=appcelerator
 IMAGE="${1:-amp-bootstrap}"
 
diff --git a/platform/stacks/amp.stack.yml b/platform/stacks/amp.stack.yml
index 58f707087..3f59d5e50 100644
--- a/platform/stacks/amp.stack.yml
+++ b/platform/stacks/amp.stack.yml
@@ -15,7 +15,7 @@ secrets:
 services:
 
   amplifier:
-    image: appcelerator/amplifier:${TAG:-0.10.1}
+    image: appcelerator/amplifier:${TAG:-0.11.0}
     networks:
       default:
         aliases:
@@ -43,7 +43,7 @@ services:
         mode: 0400
 
   amplifier-gateway:
-    image: appcelerator/amplifier-gateway:${TAG:-0.10.1}
+    image: appcelerator/amplifier-gateway:${TAG:-0.11.0}
     networks:
       default:
         aliases:
@@ -64,7 +64,7 @@ services:
         - node.role == ${NODE_ROLE:-worker}
 
   agent:
-    image: appcelerator/agent:${TAG:-0.10.1}
+    image: appcelerator/agent:${TAG:-0.11.0}
     networks:
       default:
         aliases:
diff --git a/platform/stacks/ampmon.2.stack.yml b/platform/stacks/ampmon.2.stack.yml
index d9fbdf7a8..aab254f5e 100644
--- a/platform/stacks/ampmon.2.stack.yml
+++ b/platform/stacks/ampmon.2.stack.yml
@@ -8,7 +8,7 @@ networks:
 services:
 
   ampbeat:
-    image: appcelerator/ampbeat:${TAG:-0.10.1}
+    image: appcelerator/ampbeat:${TAG:-0.11.0}
     networks:
       default:
         aliases:
@@ -25,7 +25,7 @@ services:
       io.amp.role: "infrastructure"
 
   kibana:
-    image: appcelerator/kibana:5.3.1
+    image: appcelerator/kibana:5.3.2
     networks:
       default:
         aliases:
diff --git a/platform/stacks/ampproxy.stack.yml b/platform/stacks/ampproxy.stack.yml
index 4ef725a82..3a0a307b2 100644
--- a/platform/stacks/ampproxy.stack.yml
+++ b/platform/stacks/ampproxy.stack.yml
@@ -6,7 +6,9 @@ networks:
       name: ampnet
 
 secrets:
-  certificate_atomiq:
+  certificate_appcelerator:
+    external: true
+  certificate_atomiq_fc:
     external: true
 
 services:
@@ -32,6 +34,9 @@ services:
       - "443:443"
       - "1936:1936"
     secrets:
-      - source: certificate_atomiq
+      - source: certificate_atomiq_fc
         target: cert0.pem
         mode: 0400
+      - source: certificate_appcelerator
+        target: cert1.pem
+        mode: 0400
diff --git a/platform/stacks/portal.stack.yml b/platform/stacks/portal.stack.yml
index 69a67cd1a..4f8de565e 100644
--- a/platform/stacks/portal.stack.yml
+++ b/platform/stacks/portal.stack.yml
@@ -9,7 +9,7 @@ networks:
 services:
 
   portal:
-    image: appcelerator/portal:${TAG:-0.10.1}
+    image: appcelerator/portal:${TAG:-0.11.0}
     networks:
       - default
     deploy: