diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 5c65249..783c0b8 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/pom.xml
@@ -44,6 +44,10 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-crypto</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-rsa</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
diff --git a/config-client-decrypt/src/main/resources/bootstrap.yml b/config-client-decrypt/src/main/resources/bootstrap.yml
index 9084a0f..468af46 100644
--- a/config-client-decrypt/src/main/resources/bootstrap.yml
+++ b/config-client-decrypt/src/main/resources/bootstrap.yml
@@ -1,7 +1,25 @@
 debug: true
-encrypt:
-  key: ${SECRET_KEY:foo} # normally this would be an environment variable
+
+---
 spring:
+  profiles: default
   cloud:
     config:
       uri: '{cipher}10360db84ecacacf224df3334b02c85b4490b94ee6e6469bf86dd077aa6667f9b84ee3b60343f2c32d61dc14141fe5d0'
+encrypt:
+  key: ${SECRET_KEY:foo} # normally this would be an environment variable
+
+---
+spring:
+  profiles: rsa
+  cloud:
+    config:
+      uri: '{cipher}AQB1ZzADAe6i2ltd857NEc1utA+D6cHjyVs8LusiwwrpMzpmhhss5NthMnNwPS14fOzqb6PVopuxgeMcgnF+bUkH66V3mOlGz9O2xbhWQdt1DBKmstxelqWDNVuE0pNIC6j7GNqBvKmnK1JaIDz2oclkR/YVcxPl6hSTNKXUc+pyrU7cpWEm3As6MMpmwTEU7hBdqFh73baTvHYOAnBTHQK1F85Om4/nOnVluh+Kh1yBWgzBx1wlASORB2IbzTDOuzeGcKGlWPl/s8O4asLNKylXnJOI0DUyq5nyn89LWz3axaEvKCCyZgztobudEpqNRzrttCb4qQ/mfn+rhC/o5wdJBiK76aj9tObDo5PsfCV5g+ZBrlSqiwm2d8gXN/4D4PD9PRtPYs8SuuKecKDjTzrJ'
+
+encrypt:
+  failOnError: false
+  keyStore:
+    location: classpath:keystore.jks
+    password: ${KEYSTORE_PASSWORD:foobar} # don't use a default in production
+    alias: test
+
diff --git a/config-client-decrypt/src/main/resources/keystore.jks b/config-client-decrypt/src/main/resources/keystore.jks
new file mode 100644
index 0000000..0ad98ea
Binary files /dev/null and b/config-client-decrypt/src/main/resources/keystore.jks differ
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 04348b8..680d270 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -5,7 +5,6 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-configserver</artifactId>
-	<version>Brixton.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-configserver</name>
@@ -20,7 +19,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<start-class>demo.DemoApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
 
diff --git a/configserver/src/main/resources/application.yml b/configserver/src/main/resources/application.yml
index bb01812..01a503f 100644
--- a/configserver/src/main/resources/application.yml
+++ b/configserver/src/main/resources/application.yml
@@ -1,19 +1,41 @@
 server:
   port: 8888
-
-encrypt:
-  key: ${SECRET_KEY:foo} # normally this would be an environment variable
-
 spring:
   application:
     name: configserver
   cloud:
     config:
       server:
-        bootstrap: true
         git:
           uri: https://github.com/spring-cloud-samples/config-repo
         encrypt:
           enabled: false
+
+---
+spring:
+  profiles: default
+  cloud:
+    config:
+      server:
         overrides:
           info.bar: '\{cipher}762c11829d517b203ac94a0180f1950b133b83cde34296549d8fed611a9b2fb5'
+
+encrypt:
+  key: ${SECRET_KEY:foo} # normally this would be an environment variable
+
+---
+spring:
+  profiles: rsa
+  cloud:
+    config:
+      server:
+        overrides:
+          info.bar: '\{cipher}AQAj4tMJizMZS9sBvGjqRz4e6hxKpYXBA3CdtNMBeqS8UaLc8uiy4iydcD8C9z3cDMVprUYXjonCYarwU+13ggtxBUXuNAR1HAzCKWgkB+h8oAtYhBFb3+6gAFb4dFV+9h+DUID6OpAWmFfXj0QI0cuOMx7CXecLSflFAOtF1YUz2y9eQLp2bF8aDx8R/0TEYAYWjLGfibxOXRxRVKH3qLO4YQwQTmnHn5jtIVHtzsmo2ywJq4ySpuRZysy5gxWJwv4ogzVhk46gSesjhfX5Ysbwz6ZP4dQmzGWt8dNrzI99wBUzUXppNv5xtO/E8tUtD6TVJ/CpZuXvmuV5gpZ1Ni2w+ZDBpQfDjs74rqUdUWhnYc6KEj8hM2FaBUESqu7yweQ='
+
+encrypt:
+  failOnError: false
+  keyStore:
+    location: classpath:keystore.jks
+    password: ${KEYSTORE_PASSWORD:foobar} # don't use a default in production
+    alias: test
+
diff --git a/configserver/src/main/resources/keystore.jks b/configserver/src/main/resources/keystore.jks
new file mode 100644
index 0000000..0ad98ea
Binary files /dev/null and b/configserver/src/main/resources/keystore.jks differ