diff --git a/backend/build.gradle b/backend/build.gradle
index 7f933965d..71ab2c763 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -171,9 +171,10 @@ dependencies {
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.0'
 
     compile "com.h2database:h2"
-    runtimeOnly 'org.postgresql:postgresql:42.3.4'
-    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.4'
-    runtimeOnly 'mysql:mysql-connector-java:8.0.29'
+    runtimeOnly "org.postgresql:postgresql:${project.'postgresVersion'}"
+    runtimeOnly "org.mariadb.jdbc:mariadb-java-client:${project.'mariadbVersion'}"
+    runtimeOnly "mysql:mysql-connector-java:${project.'mysqlVersion'}"
+    runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${project.'sqlserverVersion'}"
 
     //Swagger 3
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.8'
diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
index b468a2ffa..6d976a033 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
@@ -14,7 +14,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetad
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.TemplateScheme
-import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
@@ -269,7 +268,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         when:
         ResourceBackedMetadataResolver resolver = new ResourceBackedMetadataResolver(name: 'rbmr').with {
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(taskTimerRef: 'taskTimerRef')
-            it.classpathMetadataResource = new ClasspathMetadataResource(file: 'metadata.xml')
+            it.classpathMetadataResource = new ClasspathMetadataResource(fileResource: 'metadata.xml')
             it
         }
 
@@ -283,7 +282,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         resolverHistory.size() == 1
         getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr'
         getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef'
-        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.fileResource == 'metadata.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L
         getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort()
@@ -291,7 +290,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         when:
         resolver.name = 'rbmrUPDATED'
         resolver.reloadableMetadataResolverAttributes.taskTimerRef = 'taskTimerRefUPDATED'
-        resolver.classpathMetadataResource.file = 'metadataUPDATED.xml'
+        resolver.classpathMetadataResource.fileResource = 'metadataUPDATED.xml'
 
         resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver,
                 metadataResolverRepository,
@@ -303,7 +302,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         resolverHistory.size() == 2
         getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'rbmrUPDATED'
         getTargetEntityForRevisionIndex(resolverHistory, 1).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRefUPDATED'
-        getTargetEntityForRevisionIndex(resolverHistory, 1).classpathMetadataResource.file == 'metadataUPDATED.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 1).classpathMetadataResource.fileResource == 'metadataUPDATED.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L
         getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort()
@@ -311,8 +310,8 @@ class MetadataResolverEnversVersioningTests extends Specification {
         //Check the original revision is intact
         getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr'
         getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef'
-        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.fileResource == 'metadata.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
index 1116328fc..06e730ecd 100644
--- a/backend/src/integration/resources/SHIBUI-1281.side
+++ b/backend/src/integration/resources/SHIBUI-1281.side
@@ -1974,7 +1974,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//div/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
index d1a582063..4a61515ff 100644
--- a/backend/src/integration/resources/SHIBUI-1333.side
+++ b/backend/src/integration/resources/SHIBUI-1333.side
@@ -1956,7 +1956,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//div/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -2253,7 +2253,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:idRelative"],
         ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     },{
             "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
             "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index f213dcae5..f0491037d 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -1966,7 +1966,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//div/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "a1050ebe-55c5-4eac-8d12-615f3ff1cd72",
       "comment": "",
@@ -2281,7 +2281,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:idRelative"],
         ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index 6a11270a6..801580133 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -1995,9 +1995,9 @@
         ["css=.d-flex:nth-child(1) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div/div/span", "xpath:idRelative"],
         ["xpath=//section[9]/div/div[2]/div[2]/div/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -2291,9 +2291,9 @@
         ["css=.d-flex:nth-child(1) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div/div/span", "xpath:idRelative"],
         ["xpath=//section[8]/div/div[2]/div[2]/div/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index 89087d646..2a6525167 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -2013,7 +2013,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div[2]/div", "xpath:idRelative"],
         ["xpath=//section[9]/div/div[2]/div[2]/div[2]/div", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -2289,7 +2289,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div[3]/div", "xpath:idRelative"],
         ["xpath=//section[8]/div/div[2]/div[2]/div[3]/div", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1521.side b/backend/src/integration/resources/SHIBUI-1521.side
index f49fef4c4..b1ec76f6d 100644
--- a/backend/src/integration/resources/SHIBUI-1521.side
+++ b/backend/src/integration/resources/SHIBUI-1521.side
@@ -1808,7 +1808,7 @@
         ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//div/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1744-2.side b/backend/src/integration/resources/SHIBUI-1744-2.side
index 81b5c2d19..40e268775 100644
--- a/backend/src/integration/resources/SHIBUI-1744-2.side
+++ b/backend/src/integration/resources/SHIBUI-1744-2.side
@@ -547,9 +547,9 @@
         ["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div[3]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[3]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "bfc6ef5f-aaf7-4945-bbc1-d89e95b8d3ac",
       "comment": "",
@@ -560,7 +560,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div[4]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[4]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "5225f1db-7bdc-432e-a422-c6684b9e8416",
       "comment": "",
@@ -571,7 +571,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "2a14e2d4-31f1-4ae8-b977-b6edd94de02c",
       "comment": "",
@@ -614,9 +614,9 @@
         ["css=.d-flex:nth-child(4) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div[4]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[4]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "09fa0157-7e1a-4886-969e-fe9519974923",
       "comment": "",
@@ -626,9 +626,9 @@
         ["css=.d-flex:nth-child(4) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div[4]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[4]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "95dd6769-d8b6-4c1e-a799-fb4c083a1b43",
       "comment": "",
@@ -638,9 +638,9 @@
         ["css=.d-flex:nth-child(4) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div[4]/div/span", "xpath:idRelative"],
         ["xpath=//div[2]/div[4]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     },{
             "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
             "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1744-3.side b/backend/src/integration/resources/SHIBUI-1744-3.side
index 030f88927..67e45e747 100644
--- a/backend/src/integration/resources/SHIBUI-1744-3.side
+++ b/backend/src/integration/resources/SHIBUI-1744-3.side
@@ -652,9 +652,9 @@
         ["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"],
         ["xpath=//div[@id='filters']/ul/li/div[2]/section[3]/div/div[2]/div[2]/div[3]/div/span", "xpath:idRelative"],
         ["xpath=//section[3]/div/div[2]/div[2]/div[3]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "64723648-aef5-4c50-8605-74c5992ac628",
       "comment": "",
@@ -665,7 +665,7 @@
         ["xpath=//div[@id='filters']/ul/li/div[2]/section[3]/div/div[2]/div[2]/div[4]/div/span", "xpath:idRelative"],
         ["xpath=//section[3]/div/div[2]/div[2]/div[4]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     }, {
       "id": "509ee76e-7d39-453e-a5cc-cf7b3975b476",
       "comment": "",
@@ -676,7 +676,7 @@
         ["xpath=//div[@id='filters']/ul/li/div[2]/section[3]/div/div[2]/div[2]/div[5]/div/span", "xpath:idRelative"],
         ["xpath=//section[3]/div/div[2]/div[2]/div[5]/div/span", "xpath:position"]
       ],
-      "value": "True"
+      "value": "true"
     },{
             "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
             "comment": "",
diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index 59e667872..170a45fa8 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -426,7 +426,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 MetadataResource(
                         'xmlns:resource': 'urn:mace:shibboleth:2.0:resource',
                         'xsi:type': 'resource:ClasspathResource',
-                        'file': resolver.classpathMetadataResource.file)
+                        'file': resolver.classpathMetadataResource.fileResource)
             }
 
             childNodes()
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
index f1d14911a..6e7ced3e2 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -35,7 +35,7 @@ public class CustomEntityAttributeDefinition implements IRelyingPartyOverridePro
     @ElementCollection
     @CollectionTable(name = "custom_entity_attr_list_items", joinColumns = @JoinColumn(name = "name"))
     @Fetch(FetchMode.JOIN)
-    @Column(name = "value", nullable = false)
+    @Column(name = "item_value", nullable = false)
     Set<String> customAttrListDefinitions = new HashSet<>();
 
     @Column(name = "default_value", nullable = true)
@@ -114,4 +114,4 @@ public void setName(String name) {
     public void updateExamplesList() {
         examples = customAttrListDefinitions;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
index e0a54d494..3f7dcb48e 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
@@ -3,6 +3,7 @@
 import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
+import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 
 @MappedSuperclass
@@ -11,6 +12,7 @@ public class LocalizedName extends AbstractXMLObject implements org.opensaml.sam
 
     private String xMLLang;
 
+    @Column(name = "name_value")
     private String value;
 
     @Nullable
@@ -34,4 +36,4 @@ public String getValue() {
     public void setValue(@Nullable String value) {
         this.value = value;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
index c8e556695..625e96379 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
@@ -14,7 +14,7 @@ public class OrganizationURL extends AbstractXMLObject implements org.opensaml.s
 
     private String xMLLang;
 
-    @Column(name="value")
+    @Column(name="uri_value")
     private String uri;
 
     @Nullable
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
index b1db21b72..cff1a3c9d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
@@ -14,6 +15,7 @@
 public class X509Certificate extends AbstractXMLObject implements org.opensaml.xmlsec.signature.X509Certificate {
     @Column(name = "x509CertificateValue")
     @Lob
+    @Type(type = "org.hibernate.type.TextType")
     private String value;
 
     @Nullable
@@ -26,4 +28,4 @@ public String getValue() {
     public void setValue(@Nullable String value) {
         this.value = value;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
index a7959dbbf..e2ed028a0 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
@@ -26,7 +26,7 @@ public class EntityAttributesFilterTarget extends AbstractAuditable implements I
 
     @ElementCollection (fetch = FetchType.EAGER)
     @OrderColumn
-    @Column(length = 760)
+    @Column(length = 760, name="target_value")
     private List<String> value;
 
     public EntityAttributesFilterTargetType getEntityAttributesFilterTargetType() {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
index 90445ff75..3a5bfe9da 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
@@ -8,6 +8,7 @@
 import org.hibernate.envers.AuditOverride;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.OrderColumn;
@@ -27,6 +28,7 @@ public class NameIdFormatFilterTarget extends AbstractAuditable implements IFilt
 
     @ElementCollection
     @OrderColumn
+    @Column(name="target_value")
     private List<String> value;
 
     public NameIdFormatFilterTargetType getNameIdFormatFilterTargetType() {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ClasspathMetadataResource.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ClasspathMetadataResource.java
index a3dc076ab..a76943378 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ClasspathMetadataResource.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ClasspathMetadataResource.java
@@ -15,6 +15,6 @@
 @Setter
 @EqualsAndHashCode
 public class ClasspathMetadataResource {
-
-    private String file;
-}
+    // renamed from "file" to work with SQLServer
+    private String fileResource;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
index c5d64dc5b..4b642e52a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
@@ -15,6 +15,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.io.File;
 import java.time.Duration;
 import java.time.Instant;
 
@@ -135,4 +136,16 @@ public synchronized void refresh() throws ResolverException {
             }
         }
     }
+
+    @Override
+    public void validateBackupFile(final File backupFile) throws ResolverException {
+        // NOPE, not going to validate this because the file reference is likely not to exist on the shibui server nor even be a
+        // valid path on the running server. The file is needed for the XML, but we shouldn't be validating it.
+    }
+
+    @Override
+    protected byte[] fetchMetadata() throws ResolverException {
+        // NOPE, we don't need to try and fetch the metadata from either the URI nor the file
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
index c247e7b53..f8b9a856f 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
@@ -88,4 +88,16 @@ public void refilter() {
             logger.error("An error occurred while attempting to filter metadata!", e);
         }
     }
+
+    @Override
+    public void validateMetadataFile(@Nonnull final File file) throws ResolverException {
+        // NOPE, not going to validate this because the file reference is likely not to exist on the shibui server nor even be a
+        // valid path on the running server. The file is needed for the XML, but we shouldn't be validating it.
+    }
+
+    @Override
+    protected byte[] fetchMetadata() throws ResolverException {
+        // NOPE, we don't need to try and fetch the metadata
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
index 2343206a7..d0d20bd61 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
@@ -99,7 +99,7 @@ private OpenSamlResourceBackedMetadataResolver convertToOpenSamlRepresentation(R
                 break;
             case CLASSPATH:
                 resource = ResourceHelper.of(new ClassPathResource(placeholderResolverService()
-                        .resolveValueFromPossibleTokenPlaceholder(resolver.getClasspathMetadataResource().getFile())));
+                        .resolveValueFromPossibleTokenPlaceholder(resolver.getClasspathMetadataResource().getFileResource())));
                 break;
             default:
                 throw new RuntimeException("Unsupported resource type!");
@@ -153,4 +153,4 @@ public boolean isDirectory() {
             return true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index adcb452f0..109e7c30f 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -9,6 +9,9 @@ logging.level.org.springframework=INFO
 logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO
 
 spring.main.allow-bean-definition-overriding=true
+# "In Spring MVC, the path was previously analyzed by AntPathMatcher, but it was changed to use PathPatternParser introduced in WebFlux from Spring 5.3.0."
+# we still have the option to use ant path matcher thus keeping existing configuration from having to change
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 # Database Credentials
 spring.datasource.username=shibui
@@ -16,7 +19,7 @@ spring.datasource.password=shibui
 
 # Database Configuration H2
 spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-spring.datasource.platform=h2
+spring.sql.init.platform=h2
 spring.datasource.driverClassName=org.h2.Driver
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.h2.console.enabled=true
@@ -37,14 +40,15 @@ spring.jackson.mapper.accept-case-insensitive-enums=true
 #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 
 # Liquibase properties
-spring.liquibase.enabled=false
+spring.liquibase.enabled=true
+spring.liquibase.change-log=db/changelog/changelog.sql
 
 # Hibernate properties
 # for production never ever use create, create-drop. It's BEST to use validate
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
 spring.jpa.show-sql=false
-spring.jpa.properties.hibernate.format_sql=false
+spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.check_nullability=true
 spring.jpa.hibernate.use-new-id-generator-mappings=true
 
@@ -114,10 +118,13 @@ shibui.roles.authenticated=ADMIN,ENABLE,USER
 #docker container
 shibui.beacon-enabled=true
 
+### Swagger/Springdoc patterns
 springdoc.use-management-port=true
 springdoc.swagger-ui.tagsSorter: alpha
 springdoc.writer-with-order-by-keys: true
 springdoc.pathsToMatch=/entities, /api/**
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
-management.endpoints.web.exposure.include=openapi, swagger-ui
-management.server.port=9090
\ No newline at end of file
+management.endpoints.web.exposure.include=openapi, swagger-ui, info
+management.server.port=9090
+management.endpoints.web.cors.allowed-origins=*
+management.endpoints.web.cors.allowed-headers=*
\ No newline at end of file
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 671000aa6..ffeab970c 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -1,3 +1,12 @@
+#spring:
+#  jpa:
+#    show-sql: false
+#    properties:
+#      hibernate:
+#        format_sql: true
+#        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+# OR SEE: https://access.redhat.com/webassets/avalon/d/red-hat-jboss-enterprise-application-platform/7.2/javadocs/org/hibernate/dialect/package-summary.html
+
 #shibui:
 ## Default password must be set for the default user to be configured and setup
 #  default-rootuser:root
diff --git a/backend/src/main/resources/db/changelog/README.txt b/backend/src/main/resources/db/changelog/README.txt
new file mode 100644
index 000000000..2ebb5d59f
--- /dev/null
+++ b/backend/src/main/resources/db/changelog/README.txt
@@ -0,0 +1,18 @@
+Understanding the liquidbase changelog.sql file
+
+" -- liquibase formatted sql" - this is required at the top of this file "
+
+" -- changeset liquibase:1.11.0 dbms:mariadb,mysql,postgresql "
+This indicates a change set and the version - please use the release version that the change matches so that looking at the DB should
+give a good indication of what has been run.
+
+The dbms section indicates which DBs the changeset that follows is valid to be run on. If this is not present, Liquidbase will try
+to run the changeset always.
+
+" -- preconditions onFail:MARK_RAN "
+" -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' "
+
+@see - https://docs.liquibase.com/concepts/changelogs/preconditions.html
+The check here is looking to see if the schema has been built out yet. If it has not, then the db is new and will be created
+correctly without needing to be updated, so MARK_RAN ensures that the given changeset will not be run, but will be added to the
+liquibase changesetlog table indicating that it was checked.
\ No newline at end of file
diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
new file mode 100644
index 000000000..0a63846a3
--- /dev/null
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -0,0 +1,178 @@
+-- liquibase formatted sql
+
+-- changeset liquibase:1.11.0.1 dbms:mysql,mariadb
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+ALTER TABLE custom_entity_attr_list_items
+    CHANGE value item_value varchar(255);
+GO
+ALTER TABLE custom_entity_attr_list_items_aud
+    CHANGE value item_value varchar(255);
+GO
+ALTER TABLE entity_attributes_filter_target_value
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE entity_attributes_filter_target_value_aud
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE name_id_format_filter_target_value
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE name_id_format_filter_target_value_aud
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE organizationurl
+    CHANGE value uri_value varchar(255);
+GO
+ALTER TABLE organizationurl_aud
+    CHANGE value uri_value varchar(255);
+GO
+ALTER TABLE organization_display_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_display_name_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_name_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE resource_backed_metadata_resolver
+    CHANGE file file_resource varchar(255);
+GO
+ALTER TABLE resource_backed_metadata_resolver_aud
+    CHANGE file file_resource varchar(255);
+GO
+ALTER TABLE service_description
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_description_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_name_aud
+    CHANGE value name_value varchar(255);
+GO
+
+
+-- changeset liquibase:1.11.0.1 dbms:postgresql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+ALTER TABLE custom_entity_attr_list_items
+    RENAME "value" TO "item_value";
+GO
+ALTER TABLE custom_entity_attr_list_items_aud
+    RENAME "value" TO "item_value";
+GO
+ALTER TABLE entity_attributes_filter_target_value
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE entity_attributes_filter_target_value_aud
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE name_id_format_filter_target_value
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE name_id_format_filter_target_value_aud
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE organizationurl
+    RENAME "value" TO "uri_value";
+GO
+ALTER TABLE organizationurl_aud
+    RENAME "value" TO "uri_value";
+GO
+ALTER TABLE organization_display_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE organization_display_name_aud
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE organization_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE organization_name_aud
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE resource_backed_metadata_resolver
+    RENAME "file" TO "file_resource";
+GO
+ALTER TABLE resource_backed_metadata_resolver_aud
+    RENAME "file" TO "file_resource";
+GO
+ALTER TABLE service_description
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE service_description_aud
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE service_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE service_name_aud
+    RENAME "value" TO "name_value";
+GO
+
+
+-- changeset liquibase:1.11.0.1 dbms:mssql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+EXEC sp_rename 'custom_entity_attr_list_items.value', item_value, 'COLUMN'
+GO
+EXEC sp_rename 'custom_entity_attr_list_items_aud.value', item_value, 'COLUMN'
+GO
+EXEC sp_rename 'entity_attributes_filter_target_value.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'entity_attributes_filter_target_value_aud.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'name_id_format_filter_target_value.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'name_id_format_filter_target_value_aud.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'organizationurl.value', uri_value, 'COLUMN'
+GO
+EXEC sp_rename 'organizationurl_aud.value', uri_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_display_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_display_name_aud.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_name_aud.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_description.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_description_aud.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_name_aud.value', name_value, 'COLUMN'
+GO
+
+-- changeset liquibase:1.11.0.2 dbms:mariadb,postgresql,mssql,mysql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+
+update filesystem_metadata_resolver set min_refresh_delay ='PT5M';
+update filesystem_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update filesystem_metadata_resolver set max_refresh_delay ='PT4H';
+update filesystem_metadata_resolver_aud set max_refresh_delay ='PT4H';
+
+update file_backed_http_metadata_resolver set min_refresh_delay ='PT5M';
+update file_backed_http_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update file_backed_http_metadata_resolver set max_refresh_delay ='PT4H';
+update file_backed_http_metadata_resolver_aud set max_refresh_delay ='PT4H';
+
+update resource_backed_metadata_resolver set min_refresh_delay ='PT5M';
+update resource_backed_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update resource_backed_metadata_resolver set max_refresh_delay ='PT4H';
+update resource_backed_metadata_resolver_aud set max_refresh_delay ='PT4H';
\ No newline at end of file
diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
index 7969495f2..a4db5a52d 100644
--- a/backend/src/main/resources/file-system-metadata-provider.schema.json
+++ b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -1,11 +1,6 @@
 {
     "type": "object",
-    "required": [
-        "name",
-        "@type",
-        "xmlId",
-        "metadataFile"
-    ],
+    "required": ["name", "@type", "xmlId", "metadataFile"],
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
@@ -47,18 +42,21 @@
         },
         "reloadableMetadataResolverAttributes": {
             "type": "object",
+            "required": ["minRefreshDelay", "maxRefreshDelay"],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
@@ -71,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 0d76aff03..d5202280e 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -686,7 +686,7 @@ tooltip.retained-roles=Note that property replacement cannot be used on this ele
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
 
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. Setting this to 0 will result in the default value being used.
 tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
 tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index dc4bce8b9..ca93cdbb3 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -531,7 +531,7 @@ tooltip.retained-roles=Note that property replacement cannot be used on this ele
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
 
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. Setting this to 0 will result in the default value being used.
 tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
 tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/OpenSamlResourceBackedMetadataResolverTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/OpenSamlResourceBackedMetadataResolverTests.groovy
index 28223b2f8..52ae52374 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/OpenSamlResourceBackedMetadataResolverTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/OpenSamlResourceBackedMetadataResolverTests.groovy
@@ -15,10 +15,10 @@ class OpenSamlResourceBackedMetadataResolverTests extends Specification {
     def 'test refresh'() {
         when:
         def rbmr = new ResourceBackedMetadataResolver(name: 'test', xmlId: 'test', classpathMetadataResource: new ClasspathMetadataResource('metadata/metadata.xml'))
-        def x = new OpenSamlResourceBackedMetadataResolver(openSamlObjects.parserPool, null, rbmr, ResourceHelper.of(new ClassPathResource(rbmr.classpathMetadataResource.file)))
+        def x = new OpenSamlResourceBackedMetadataResolver(openSamlObjects.parserPool, null, rbmr, ResourceHelper.of(new ClassPathResource(rbmr.classpathMetadataResource.fileResource)))
         x.refilter()
 
         then:
         noExceptionThrown()
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
index e6fb74476..9905dbcea 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -155,7 +155,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
             it.resourceId = "testme"
             it.name = "testme"
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = "metadata/aggregate.xml"
+                it.fileResource = "metadata/aggregate.xml"
                 it
             }
             it.metadataFilters.add(new EntityAttributesFilter().with {
@@ -322,7 +322,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
         def resolver = new edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver().with {
             it.xmlId = 'ClasspathResourceMetadata'
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = '/path/to/a/classpath/location/metadata.xml'
+                it.fileResource = '/path/to/a/classpath/location/metadata.xml'
                 it
             }
             it
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index bf17b107e..7b2865462 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -30,7 +30,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProt
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.SvnMetadataResource
 import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import edu.internet2.tier.shibboleth.admin.util.MDDCConstants
 import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions
@@ -607,7 +606,7 @@ class TestObjectGenerator {
             it.name = 'ClasspathResourceMetadata'
             it.xmlId = 'ClasspathResourceMetadata'
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = 'metadata/metadata.xml'
+                it.fileResource = 'metadata/metadata.xml'
                 it
             }
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
diff --git a/gradle.properties b/gradle.properties
index f645de2d4..f891afd02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,8 +5,7 @@ version=1.11.0-SNAPSHOT
 ### library versions ###
 commonsCollections4Version=4.4
 cryptacularVersion=1.2.4
-hibernateVersion=5.5.0.Final
-#hibernateVersion=5.6.9.Final
+hibernateVersion=5.6.9.Final
 luceneVersion=8.1.1
 log4JVersion=2.17.2
 lombokVersion=5.3.3.3
@@ -14,10 +13,14 @@ opensamlVersion=4.2.0
 pac4JVersion=5.4.3
 pac4jSpringSecurityVersion=7.0.3
 shibbolethVersion=4.2.1
-springbootVersion=2.5.12
-#springbootVersion=2.7.0
-springSecurityVersion=5.6.3
-# springSecurityVersion=5.7.1
+springbootVersion=2.7.0
+springSecurityVersion=5.7.1
+
+### DB Driver Versions ###
+mariadbVersion=3.0.4
+mysqlVersion=8.0.29
+postgresVersion=42.3.4
+sqlserverVersion=9.4.1.jre11
 
 org.gradle.jvmargs=-Xmx1g -XX:-UseGCOverheadLimit
 
@@ -29,10 +32,4 @@ i2.github.apiEndpoint=https://github.internet2.edu/api/v3
 
 ## NOTES
 # pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used use the same versions, now
-# keeping them in sync takes paying attention
-#
-# Springboot 2.7.0 and Hibernate 5.6.9 are current, but don't like all the columns named "value" in the db (along with H2), so don't
-# update to these versions until ready to migrate the database columns. (the tests fail under these versions because the test database
-# doesn't work).
-#
-# Additionally, springbootsecurity for tests doesn't like 5.7.1
\ No newline at end of file
+# keeping them in sync takes paying attention
\ No newline at end of file
diff --git a/testbed/mariadb/conf/application.yml b/testbed/mariadb/conf/application.yml
index 68018a4b9..82fe6fec7 100644
--- a/testbed/mariadb/conf/application.yml
+++ b/testbed/mariadb/conf/application.yml
@@ -10,7 +10,7 @@ spring:
   jpa:
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.MariaDBDialect
+        dialect: org.hibernate.dialect.MariaDB103Dialect
 server:
   port: 8443
   ssl:
@@ -135,4 +135,4 @@ custom:
 logging:
   level:
     org.pac4j: "TRACE"
-    org.opensaml: "INFO"
+    org.opensaml: "INFO"
\ No newline at end of file
diff --git a/testbed/postgres/conf/application.yml b/testbed/postgres/conf/application.yml
index 2173107e1..56fd5e709 100644
--- a/testbed/postgres/conf/application.yml
+++ b/testbed/postgres/conf/application.yml
@@ -8,9 +8,11 @@ spring:
     username: shibui
     password: shibui
   jpa:
+    show-sql: false
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
+        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+        format_sql: true
 server:
   port: 8443
   ssl:
@@ -135,4 +137,4 @@ custom:
 logging:
   level:
     org.pac4j: "TRACE"
-    org.opensaml: "INFO"
+    org.opensaml: "INFO"
\ No newline at end of file
diff --git a/testbed/postgres/docker-compose.yml b/testbed/postgres/docker-compose.yml
index 593ceb1fc..c66b591a8 100644
--- a/testbed/postgres/docker-compose.yml
+++ b/testbed/postgres/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     networks:
       - front
     ports:
-      - 3306:3306
+      - 5432:5432
   shibui:
     image: unicon/shibui
     ports:
diff --git a/testbed/sqlServer/conf/application.yml b/testbed/sqlServer/conf/application.yml
new file mode 100644
index 000000000..f69ccb318
--- /dev/null
+++ b/testbed/sqlServer/conf/application.yml
@@ -0,0 +1,138 @@
+spring:
+  profiles:
+    include: dev
+  datasource:
+    platform: sqlserver
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://db:1433
+    username: sa
+    password: Password1
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.SQLServerDialect
+server:
+  port: 8443
+  ssl:
+    key-store: "/conf/keystore.p12"
+    key-store-password: "changeit"
+    keyStoreType: "PKCS12"
+    keyAlias: "tomcat"
+shibui:
+  user-bootstrap-resource: file:/conf/users.csv
+  roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_PONY
+custom:
+  attributes:
+    # Default attributes
+    - name: eduPersonPrincipalName
+      displayName: label.attribute-eduPersonPrincipalName
+    - name: uid
+      displayName: label.attribute-uid
+    - name: mail
+      displayName: label.attribute-mail
+    - name: surname
+      displayName: label.attribute-surname
+    - name: givenName
+      displayName: label.attribute-givenName
+    - name: eduPersonAffiliation
+      displayName: label.attribute-eduPersonAffiliation
+    - name: eduPersonScopedAffiliation
+      displayName: label.attribute-eduPersonScopedAffiliation
+    - name: eduPersonPrimaryAffiliation
+      displayName: label.attribute-eduPersonPrimaryAffiliation
+    - name: eduPersonEntitlement
+      displayName: label.attribute-eduPersonEntitlement
+    - name: eduPersonAssurance
+      displayName: label.attribute-eduPersonAssurance
+    - name: eduPersonUniqueId
+      displayName: label.attribute-eduPersonUniqueId
+    - name: employeeNumber
+      displayName: label.attribute-employeeNumber
+  # Custom attributes
+  overrides:
+    # Default overrides
+    - name: signAssertion
+      displayName: label.sign-the-assertion
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.sign-assertion
+      attributeName: http://shibboleth.net/ns/profiles/saml2/sso/browser/signAssertions
+      attributeFriendlyName: signAssertions
+    - name: dontSignResponse
+      displayName: label.dont-sign-the-response
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.dont-sign-response
+      attributeName: http://shibboleth.net/ns/profiles/saml2/sso/browser/signResponses
+      attributeFriendlyName: signResponses
+    - name: turnOffEncryption
+      displayName: label.turn-off-encryption-of-response
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.turn-off-encryption
+      attributeName: http://shibboleth.net/ns/profiles/encryptAssertions
+      attributeFriendlyName: encryptAssertions
+    - name: useSha
+      displayName: label.use-sha1-signing-algorithm
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.usa-sha-algorithm
+      persistType: string
+      persistValue: shibboleth.SecurityConfiguration.SHA1
+      attributeName: http://shibboleth.net/ns/profiles/securityConfiguration
+      attributeFriendlyName: securityConfiguration
+    - name: ignoreAuthenticationMethod
+      displayName: label.ignore-any-sp-requested-authentication-method
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.ignore-auth-method
+      persistType: string
+      persistValue: 0x1
+      attributeName: http://shibboleth.net/ns/profiles/disallowedFeatures
+      attributeFriendlyName: disallowedFeatures
+    - name: omitNotBefore
+      displayName: label.omit-not-before-condition
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.omit-not-before-condition
+      attributeName: http://shibboleth.net/ns/profiles/includeConditionsNotBefore
+      attributeFriendlyName: includeConditionsNotBefore
+    - name: responderId
+      displayName: label.responder-id
+      displayType: string
+      defaultValue: null
+      helpText: tooltip.responder-id
+      attributeName: http://shibboleth.net/ns/profiles/responderId
+      attributeFriendlyName: responderId
+    - name: nameIdFormats
+      displayName: label.nameid-format-to-send
+      displayType: set
+      helpText: tooltip.nameid-format
+      defaultValues:
+        - urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
+        - urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+        - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
+        - urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      attributeName: http://shibboleth.net/ns/profiles/nameIDFormatPrecedence
+      attributeFriendlyName: nameIDFormatPrecedence
+    - name: authenticationMethods
+      displayName: label.authentication-methods-to-use
+      displayType: set
+      helpText: tooltip.authentication-methods-to-use
+      defaultValues:
+        - https://refeds.org/profile/mfa
+        - urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken
+        - urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport
+      attributeName: http://shibboleth.net/ns/profiles/defaultAuthenticationMethods
+      attributeFriendlyName: defaultAuthenticationMethods
+    - name: forceAuthn
+      displayName: label.force-authn
+      displayType: boolean
+      defaultValue: false
+      helpText: tooltip.force-authn
+      attributeName: http://shibboleth.net/ns/profiles/forceAuthn
+      attributeFriendlyName: forceAuthn
+logging:
+  level:
+    org.pac4j: "TRACE"
+    org.opensaml: "INFO"
\ No newline at end of file
diff --git a/testbed/sqlServer/conf/keystore.p12 b/testbed/sqlServer/conf/keystore.p12
new file mode 100644
index 000000000..57f9c162a
Binary files /dev/null and b/testbed/sqlServer/conf/keystore.p12 differ
diff --git a/testbed/sqlServer/conf/users.csv b/testbed/sqlServer/conf/users.csv
new file mode 100644
index 000000000..0ff75785d
--- /dev/null
+++ b/testbed/sqlServer/conf/users.csv
@@ -0,0 +1,2 @@
+root,{bcrypt}$2a$10$V1jeTIc0b2u7Y3yU.LqkXOPRVTBFc7SW07QaJR4KrBAmWGgTcO9H.,first,last,ROLE_ADMIN,user1@example.org
+admin,{bcrypt}$2a$10$V1jeTIc0b2u7Y3yU.LqkXOPRVTBFc7SW07QaJR4KrBAmWGgTcO9H.,first,last,ROLE_ADMIN,jj@example.org
\ No newline at end of file
diff --git a/testbed/sqlServer/docker-compose.yml b/testbed/sqlServer/docker-compose.yml
new file mode 100644
index 000000000..68276f256
--- /dev/null
+++ b/testbed/sqlServer/docker-compose.yml
@@ -0,0 +1,36 @@
+version: "3.7"
+
+services:
+  db:
+    container_name: db
+    ports:
+      - 1433:1433
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    networks:
+      - front
+  shibui:
+    image: unicon/shibui
+    ports:
+      - 8080:8080
+      - 5005:5005
+      - 8443:8443
+    volumes:
+      - ./conf:/conf
+      - ./conf/application.yml:/application.yml
+    depends_on:
+      - db
+    networks:
+      - front
+  mailhog:
+    image: mailhog/mailhog:latest
+    ports:
+      - 1025:1025
+      - 8025:8025
+    container_name: mailhog
+    networks:
+      - front
+networks:
+  front:
+    driver: bridge
\ No newline at end of file
diff --git a/testbed/sqlServer/docker/Dockerfile b/testbed/sqlServer/docker/Dockerfile
new file mode 100644
index 000000000..4d8379c31
--- /dev/null
+++ b/testbed/sqlServer/docker/Dockerfile
@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/mssql/server:2019-latest
+
+ENV ACCEPT_EULA=Y
+ENV SA_PASSWORD=Password1
+
+COPY ./docker/scripts /
+
+ENTRYPOINT [ "/bin/bash", "entrypoint.sh" ]
+CMD [ "/opt/mssql/bin/sqlservr" ]
\ No newline at end of file
diff --git a/testbed/sqlServer/docker/scripts/entrypoint.sh b/testbed/sqlServer/docker/scripts/entrypoint.sh
new file mode 100755
index 000000000..8b861beef
--- /dev/null
+++ b/testbed/sqlServer/docker/scripts/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then
+  # If this is the container's first run, initialize the application database
+  if [ ! -f /tmp/app-initialized ]; then
+    # Initialize the application database asynchronously in a background process. This allows a) the SQL Server process to be the main process in the container, which allows graceful shutdown and other goodies, and b) us to only start the SQL Server process once, as opposed to starting, stopping, then starting it again.
+    function initialize_app_database() {
+      # Wait a bit for SQL Server to start. SQL Server's process doesn't provide a clever way to check if it's up or not, and it needs to be up before we can import the application database
+      sleep 15s
+
+      #run the setup script to create the DB and the schema in the DB
+      /opt/mssql-tools/bin/sqlcmd -S db -U sa -P Password1 -d master -i setup.sql
+
+      # Note that the container has been initialized so future starts won't wipe changes to the data
+      touch /tmp/app-initialized
+    }
+    initialize_app_database &
+  fi
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/testbed/sqlServer/docker/scripts/setup.sql b/testbed/sqlServer/docker/scripts/setup.sql
new file mode 100644
index 000000000..9c49fede4
--- /dev/null
+++ b/testbed/sqlServer/docker/scripts/setup.sql
@@ -0,0 +1,10 @@
+CREATE DATABASE shibui;
+GO
+USE shibui;
+GO
+CREATE LOGIN shibui WITH PASSWORD = 'shibuiPass1';
+GO
+CREATE USER shibui FOR LOGIN shibui;
+GO
+EXEC sp_addrolemember 'db_owner', 'shibui';
+GO
\ No newline at end of file
diff --git a/ui/public/assets/schema/provider/file-system.schema.json b/ui/public/assets/schema/provider/file-system.schema.json
index 38d0d90e3..a4db5a52d 100644
--- a/ui/public/assets/schema/provider/file-system.schema.json
+++ b/ui/public/assets/schema/provider/file-system.schema.json
@@ -1,15 +1,10 @@
 {
     "type": "object",
-    "required": [
-        "name",
-        "@type",
-        "xmlId",
-        "metadataFile"
-    ],
+    "required": ["name", "@type", "xmlId", "metadataFile"],
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -20,7 +15,7 @@
             "title": "label.metadata-provider-type",
             "description": "tooltip.metadata-provider-type",
             "type": "string",
-            "const": "FilesystemMetadataResolver"
+            "default": "FilesystemMetadataResolver"
         },
         "xmlId": {
             "title": "label.xml-id",
@@ -47,18 +42,21 @@
         },
         "reloadableMetadataResolverAttributes": {
             "type": "object",
+            "required": ["minRefreshDelay", "maxRefreshDelay"],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
@@ -71,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/public/assets/schema/provider/filebacked-http.schema.json b/ui/public/assets/schema/provider/filebacked-http.schema.json
index 860733486..77f415b43 100644
--- a/ui/public/assets/schema/provider/filebacked-http.schema.json
+++ b/ui/public/assets/schema/provider/filebacked-http.schema.json
@@ -252,18 +252,24 @@
         "reloadableMetadataResolverAttributes": {
             "$id": "reloadableMetadataResolverAttributes",
             "type": "object",
+            "required": [
+                "minRefreshDelay",
+                "maxRefreshDelay"
+            ],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
diff --git a/ui/src/app/App.constant.js b/ui/src/app/App.constant.js
index 3b6af7f89..afa7a688c 100644
--- a/ui/src/app/App.constant.js
+++ b/ui/src/app/App.constant.js
@@ -5,8 +5,18 @@ export const getBasePath = () => {
     //replace(/^\/|\/$/g, '')
 };
 
+export const getActuatorPath = () => {
+    const url = new URL(document.getElementsByTagName('base')[0].href);
+
+    var foo = document.createElement("a");
+    foo.href = url.pathname?.replace(/^\/+/g, '');
+    foo.port = "9090"
+    return foo.href;
+}
+
 export const BASE_PATH = getBasePath();
 export const API_BASE_PATH = `${BASE_PATH}api`;
+export const ACTUATOR_PATH = getActuatorPath();
 
 export const FILTER_PLUGIN_TYPES = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
 
diff --git a/ui/src/app/core/components/VersionInfo.js b/ui/src/app/core/components/VersionInfo.js
index 1c6badfc1..1c88ad271 100644
--- a/ui/src/app/core/components/VersionInfo.js
+++ b/ui/src/app/core/components/VersionInfo.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import useFetch from 'use-http';
-import { BASE_PATH } from '../../App.constant';
+import { ACTUATOR_PATH } from '../../App.constant';
 
 import Translate from '../../i18n/components/translate';
 
@@ -11,11 +11,15 @@ const year = new Date().getFullYear();
 const params = { year };
 
 export function VersionInfo () {
-
-    const { data = {} } = useFetch(`${BASE_PATH}actuator/info`, {}, []);
+    var opts = {
+        headers: {
+            'mode':'no-cors'
+        }
+    }
+    const { data = {} } = useFetch(`${ACTUATOR_PATH}actuator/info`, opts, []);
 
     const [ versionData, setVersionData ] = React.useState('');
-    
+
     React.useEffect(() => {
         setVersionData(formatter(data));
     }, [data]);
@@ -29,4 +33,4 @@ export function VersionInfo () {
     );
 }
 
-export default VersionInfo;
\ No newline at end of file
+export default VersionInfo;
diff --git a/ui/src/app/metadata/contention/ContentionContext.js b/ui/src/app/metadata/contention/ContentionContext.js
index de71ff8b9..6c0e63080 100644
--- a/ui/src/app/metadata/contention/ContentionContext.js
+++ b/ui/src/app/metadata/contention/ContentionContext.js
@@ -35,6 +35,7 @@ const keys = [
     'audId',
     'resourceId',
     'current',
+    'metadataFilters',
     '@type'
 ];
 
diff --git a/ui/src/app/metadata/domain/data.js b/ui/src/app/metadata/domain/data.js
index 45412d300..b97afbddb 100644
--- a/ui/src/app/metadata/domain/data.js
+++ b/ui/src/app/metadata/domain/data.js
@@ -9,4 +9,18 @@ export const DurationOptions = [
     "PT8H",
     "PT12H",
     "PT24H"
+];
+
+export const RefreshOptions = [
+    "PT1S",
+    "PT30S",
+    "PT1M",
+    "PT5M",
+    "PT10M",
+    "PT30M",
+    "PT1H",
+    "PT4H",
+    "PT8H",
+    "PT12H",
+    "PT24H",
 ];
\ No newline at end of file
diff --git a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
index 106edfa55..e4e4be5b6 100644
--- a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
+++ b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
@@ -1,7 +1,7 @@
 import defaultsDeep from 'lodash/defaultsDeep';
 import { BaseProviderDefinition, HttpMetadataResolverAttributesSchema, MetadataFilterPluginsSchema } from './BaseProviderDefinition';
 
-import { DurationOptions } from '../../data';
+import { DurationOptions, RefreshOptions } from '../../data';
 import { BASE_PATH } from '../../../../App.constant';
 
 export const FileBackedHttpMetadataProviderWizard = {
@@ -155,12 +155,12 @@ export const FileBackedHttpMetadataProviderWizard = {
         reloadableMetadataResolverAttributes: {
             minRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             maxRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             refreshDelayFactor: {
diff --git a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
index d97b8e041..5e9d617fe 100644
--- a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
+++ b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
@@ -1,7 +1,7 @@
 import defaultsDeep from 'lodash/defaultsDeep';
 import API_BASE_PATH from "../../../../App.constant";
 import { BaseProviderDefinition } from "./BaseProviderDefinition";
-import { DurationOptions } from '../../data';
+import { RefreshOptions } from '../../data';
 
 export const FileSystemMetadataProviderWizard = {
     ...BaseProviderDefinition,
@@ -74,12 +74,12 @@ export const FileSystemMetadataProviderWizard = {
         reloadableMetadataResolverAttributes: {
             minRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             maxRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             refreshDelayFactor: {
diff --git a/ui/src/app/metadata/wizard/MetadataProviderWizard.js b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
index d2cbc0864..8dcbf73cd 100644
--- a/ui/src/app/metadata/wizard/MetadataProviderWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
@@ -49,7 +49,6 @@ export function MetadataProviderWizard({onSave, loading, block}) {
 
     return (
         <>
-
             <div className="row mb-4">
                 <div className="col-12">
                     <WizardNav onSave={save}
@@ -78,6 +77,7 @@ export function MetadataProviderWizard({onSave, loading, block}) {
                     </div>
                 </div>
             }
+            <pre>{JSON.stringify(errors, null, 4)}</pre>
         </>
     );
 }