diff --git a/iam-login-service/src/main/resources/application-h2.yml b/iam-login-service/src/main/resources/application-h2.yml
index 38c3a3e5af..288c7f7cfe 100644
--- a/iam-login-service/src/main/resources/application-h2.yml
+++ b/iam-login-service/src/main/resources/application-h2.yml
@@ -36,9 +36,6 @@ spring:
 
   jpa:
     database-platform: org.eclipse.persistence.platform.database.H2Platform
-    properties:
-      eclipselink.ddl-generation: none
-      eclipselink.ddl-generation.output-mode: none
 
 notification:
   disable: ${IAM_NOTIFICATION_DISABLE:true}
diff --git a/iam-login-service/src/main/resources/application-mysql-test-tc.yml b/iam-login-service/src/main/resources/application-mysql-test-tc.yml
index 7ef7e9dc2d..baa8916586 100644
--- a/iam-login-service/src/main/resources/application-mysql-test-tc.yml
+++ b/iam-login-service/src/main/resources/application-mysql-test-tc.yml
@@ -21,11 +21,9 @@ spring:
   
   datasource:
     url: jdbc:tc:mysql:5.7:///iam
-    
     hikari:
       maximum-pool-size: 5
       minimum-idle: 1
-      connection-test-query: SELECT 1
   
   flyway:
     locations:
diff --git a/iam-login-service/src/main/resources/application-mysql-test.yml b/iam-login-service/src/main/resources/application-mysql-test.yml
index 7679920775..fcf5a9b3a2 100644
--- a/iam-login-service/src/main/resources/application-mysql-test.yml
+++ b/iam-login-service/src/main/resources/application-mysql-test.yml
@@ -20,16 +20,11 @@ spring:
     banner-mode: off
     
   datasource:
-    
-    url: jdbc:mysql://${IAM_DB_HOST:dev.local.io}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}?useSSL=${IAM_DB_USE_SSL:false}&allowPublicKeyRetrieval=${IAM_DB_ALLOW_PUBLIC_KEY_RETRIEVAL:true}
-    username: ${IAM_DB_USERNAME:iam}
-    password: ${IAM_DB_PASSWORD:pwd}
-    
     hikari:
       maximum-pool-size: 5
       minimum-idle: 1
       connection-test-query: SELECT 1
-     
+
   flyway:
     locations:
       - classpath:db/migration/mysql
diff --git a/iam-login-service/src/main/resources/application-mysql.yml b/iam-login-service/src/main/resources/application-mysql.yml
index d5a8872be8..c37eb6da22 100644
--- a/iam-login-service/src/main/resources/application-mysql.yml
+++ b/iam-login-service/src/main/resources/application-mysql.yml
@@ -14,4 +14,19 @@
 # limitations under the License.
 #
 
-#
+spring:
+  flyway:
+    enabled: true
+    locations:
+      - classpath:db/migration/mysql
+      - classpath:db/migration/prod
+
+  datasource:
+    url: jdbc:mysql://${IAM_DB_HOST:dev.local.io}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}?useSSL=${IAM_DB_USE_SSL:false}&preserveInstant=${IAM_DB_PRESERVE_INSTANT:true}&serverTimezone=${IAM_DB_SERVER_TIMEZONE:UTC}&useSSL=${IAM_DB_USE_SSL:false}
+    username: ${IAM_DB_USERNAME:iam}
+    password: ${IAM_DB_PASSWORD:pwd}
+
+    hikari:
+      maximum-pool-size: ${IAM_DB_MAX_ACTIVE:50}
+      minimum-idle: ${IAM_DB_MIN_IDLE:8}
+      connection-test-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
diff --git a/iam-login-service/src/main/resources/application-prod.yml b/iam-login-service/src/main/resources/application-prod.yml
index 8453296690..b4494a29a5 100644
--- a/iam-login-service/src/main/resources/application-prod.yml
+++ b/iam-login-service/src/main/resources/application-prod.yml
@@ -22,18 +22,3 @@ spring:
       enabled: false
     restart:
       enabled: false
-  
-  flyway:
-    locations:
-      - classpath:db/migration/mysql
-      - classpath:db/migration/prod
-  
-  datasource:
-    url: jdbc:mysql://${IAM_DB_HOST:dev.local.io}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}?useSSL=${IAM_DB_USE_SSL:false}
-    username: ${IAM_DB_USERNAME:iam}
-    password: ${IAM_DB_PASSWORD:pwd}
-    
-    hikari:
-      maximum-pool-size: ${IAM_DB_MAX_ACTIVE:50}
-      minimum-idle: ${IAM_DB_MIN_IDLE:8}
-      connection-test-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
diff --git a/iam-voms-aa/src/main/resources/application-h2.yml b/iam-voms-aa/src/main/resources/application-h2.yml
index f6ce0cf2bd..2c553a3c74 100644
--- a/iam-voms-aa/src/main/resources/application-h2.yml
+++ b/iam-voms-aa/src/main/resources/application-h2.yml
@@ -14,15 +14,25 @@
 # limitations under the License.
 #
 
+server:
+  address: localhost
+  port: 15000
+
 spring: 
   flyway:
+    enabled: true
     locations:
     - classpath:db/migration/h2
     - classpath:db/migration/test
+  datasource:
+    type: org.h2.jdbcx.JdbcDataSource
+    url: jdbc:h2:mem:iam;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+    username: sa
+    password:
 
 voms:
   tls:
     certificate-path: src/test/resources/certs/voms_example.cert.pem
     private-key-path: src/test/resources/certs/voms_example.key.pem
     trust-anchors-dir: src/test/resources/trust-anchors
-    trust-anchors-refresh-interval-secs: 0
\ No newline at end of file
+    trust-anchors-refresh-interval-secs: 0
diff --git a/iam-voms-aa/src/main/resources/application-mysql.yml b/iam-voms-aa/src/main/resources/application-mysql.yml
index 590cf72d96..3f1f2a0780 100644
--- a/iam-voms-aa/src/main/resources/application-mysql.yml
+++ b/iam-voms-aa/src/main/resources/application-mysql.yml
@@ -16,15 +16,12 @@
 
 spring:
   datasource:
-    
-    url: jdbc:mysql://${IAM_DB_HOST:dev.local.io}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}
+    url: jdbc:mysql://${IAM_DB_HOST:localhost}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}?useSSL=${IAM_DB_USE_SSL:false}&preserveInstant=${IAM_DB_PRESERVE_INSTANT:true}&serverTimezone=${IAM_DB_SERVER_TIMEZONE:UTC}&useSSL=${IAM_DB_USE_SSL:false}
     username: ${IAM_DB_USERNAME:iam}
     password: ${IAM_DB_PASSWORD:pwd}
-    
     hikari:
       maximum-pool-size: ${IAM_DB_MAX_ACTIVE:100}
       connection-test-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
-      
-  
+
   flyway:
     enabled: false
\ No newline at end of file
diff --git a/iam-voms-aa/src/main/resources/application.yml b/iam-voms-aa/src/main/resources/application.yml
index b17c6bfe60..9d76ab59a5 100644
--- a/iam-voms-aa/src/main/resources/application.yml
+++ b/iam-voms-aa/src/main/resources/application.yml
@@ -15,32 +15,41 @@
 #
 
 server:
-  address: localhost
-  port: 15000
+  address: ${VOMS_AA_BINDING_ADDRESS:0.0.0.0}
+  port: ${VOMS_AA_PORT:8080}
+  forward-headers-strategy: ${VOMS_AA_FORWARD_HEADERS_STRATEGY:none}
   max-http-header-size: 16000
-    
-  
+
 spring:
   flyway:
+    enabled: false
     table: schema_version
-  
+  datasource:
+    url: jdbc:mysql://${IAM_DB_HOST:localhost}:${IAM_DB_PORT:3306}/${IAM_DB_NAME:iam}?useSSL=${IAM_DB_USE_SSL:false}&onnectionTimeZone=${IAM_DB_CONNECTION_TIME_ZONE:UTC}&serverTimezone=${IAM_DB_SERVER_TIMEZONE:UTC}&useSSL=${IAM_DB_USE_SSL:false}
+    username: ${IAM_DB_USERNAME:iam}
+    password: ${IAM_DB_PASSWORD:pwd}
+    hikari:
+      maximum-pool-size: ${IAM_DB_MAX_ACTIVE:50}
+      minimum-idle: ${IAM_DB_MIN_IDLE:8}
+      connection-test-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
+
   main:
     banner-mode: "off"
     allow-circular-references: true
-  
+
   jpa:
     open-in-view: false
-  
+
 voms:
   tls:
-    certificate-path: /etc/grid-security/voms/hostcert.pem
-    private-key-path: /etc/grid-security/voms/hostkey.pem
-    trust-anchors-dir: /etc/grid-security/certificates
-    trust-anchors-refresh-interval-secs: 14400
+    certificate-path: ${VOMS_AA_TLS_CERTIFICATE_PATH:/certs/hostcert.pem}
+    private-key-path: ${VOMS_AA_TLS_PRIVATE_KEY_PATH:/certs/hostkey.pem}
+    trust-anchors-dir: ${VOMS_AA_TLS_TRUST_ANCHORS_DIR:/etc/grid-security/certificates}
+    trust-anchors-refresh-interval-secs: ${VOMS_AA_TLS_TRUST_ANCHORS_REFRESH_INTERVAL_SECS:14400}
   aa:
-    host: ${server.address}
-    port: ${server.port}
-    vo-name: test
-    optional-group-label: wlcg.optional-group
-    voms-role-label: voms.role
-    use-legacy-fqan-encoding: false
\ No newline at end of file
+    host: ${VOMS_AA_BINDING_ADDRESS:0.0.0.0}
+    port: ${VOMS_AA_PORT:8080}
+    vo-name: ${VOMS_AA_VONAME:test}
+    optional-group-label: ${VOMS_AA_OPTIONAL_GROUP_LABEL:wlcg.optional-group}
+    voms-role-label: ${VOMS_AA_VOMS_ROLE_LABEL:voms.role}
+    use-legacy-fqan-encoding: ${VOMS_AA_USE_LEGACY_FQAN_ENCODING:false}