diff --git a/services/distribution/src/main/resources/bootstrap-cloud.yaml b/services/distribution/src/main/resources/bootstrap-cloud.yaml
new file mode 100644
index 0000000000..eefb9f5c43
--- /dev/null
+++ b/services/distribution/src/main/resources/bootstrap-cloud.yaml
@@ -0,0 +1,27 @@
+---
+spring:
+  application:
+    name: cwa-server
+  cloud:
+    vault:
+      enabled: true
+      generic:
+        enabled: false
+      kv:
+        enabled: true
+        backend: ${VAULT_BACKEND}
+        profile-separator: '/'
+        application-name: 'distribution'
+        default-context: ''
+        profiles: cloud
+      fail-fast: true
+      authentication: KUBERNETES
+      kubernetes:
+        role: ${VAULT_ROLE}
+        kubernetes-path: kubernetes
+        service-account-token-file: /var/run/secrets/kubernetes.io/serviceaccount/token
+      uri: ${VAULT_URI}
+      connection-timeout: 5000
+      read-timeout: 15000
+      config:
+        order: -10
diff --git a/services/distribution/src/main/resources/bootstrap.yaml b/services/distribution/src/main/resources/bootstrap.yaml
new file mode 100644
index 0000000000..4eed0cedb8
--- /dev/null
+++ b/services/distribution/src/main/resources/bootstrap.yaml
@@ -0,0 +1,5 @@
+---
+spring:
+  cloud:
+    vault:
+      enabled: false
diff --git a/services/distribution/src/test/resources/bootstrap.yaml b/services/distribution/src/test/resources/bootstrap.yaml
new file mode 100644
index 0000000000..4eed0cedb8
--- /dev/null
+++ b/services/distribution/src/test/resources/bootstrap.yaml
@@ -0,0 +1,5 @@
+---
+spring:
+  cloud:
+    vault:
+      enabled: false
diff --git a/services/submission/pom.xml b/services/submission/pom.xml
index ac670c764b..71b213dbe0 100644
--- a/services/submission/pom.xml
+++ b/services/submission/pom.xml
@@ -17,6 +17,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-vault-config</artifactId>
+      <version>2.2.3.RELEASE</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
diff --git a/services/submission/src/main/resources/bootstrap-cloud.yaml b/services/submission/src/main/resources/bootstrap-cloud.yaml
new file mode 100644
index 0000000000..9c6d6bbe01
--- /dev/null
+++ b/services/submission/src/main/resources/bootstrap-cloud.yaml
@@ -0,0 +1,27 @@
+---
+spring:
+  application:
+    name: cwa-server
+  cloud:
+    vault:
+      enabled: true
+      generic:
+        enabled: false
+      kv:
+        enabled: true
+        backend: ${VAULT_BACKEND}
+        profile-separator: '/'
+        application-name: 'submission'
+        default-context: ''
+        profiles: cloud
+      fail-fast: true
+      authentication: KUBERNETES
+      kubernetes:
+        role: ${VAULT_ROLE}
+        kubernetes-path: kubernetes
+        service-account-token-file: /var/run/secrets/kubernetes.io/serviceaccount/token
+      uri: ${VAULT_URI}
+      connection-timeout: 5000
+      read-timeout: 15000
+      config:
+        order: -10
diff --git a/services/submission/src/main/resources/bootstrap.yaml b/services/submission/src/main/resources/bootstrap.yaml
new file mode 100644
index 0000000000..4eed0cedb8
--- /dev/null
+++ b/services/submission/src/main/resources/bootstrap.yaml
@@ -0,0 +1,5 @@
+---
+spring:
+  cloud:
+    vault:
+      enabled: false
diff --git a/services/submission/src/test/resources/bootstrap.yaml b/services/submission/src/test/resources/bootstrap.yaml
new file mode 100644
index 0000000000..4eed0cedb8
--- /dev/null
+++ b/services/submission/src/test/resources/bootstrap.yaml
@@ -0,0 +1,5 @@
+---
+spring:
+  cloud:
+    vault:
+      enabled: false