diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
index e25379f30..1fc7c9439 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
@@ -62,7 +62,7 @@ public Instant getValidUntil() {
 
     @Override
     public void setValidUntil(Instant validUntilInstant) {
-        this.validUntil = LocalDateTime.ofInstant(validUntilInstant, ZoneOffset.UTC);
+        this.validUntil = validUntilInstant == null ? null : LocalDateTime.ofInstant(validUntilInstant, ZoneOffset.UTC);
     }
 
     @Override
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
index 2d31663b3..ab40e84fc 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -50,6 +50,7 @@
 import org.opensaml.xmlsec.signature.KeyName;
 import org.opensaml.xmlsec.signature.KeyValue;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -95,6 +96,9 @@ public class JPAEntityDescriptorServiceImpl implements EntityDescriptorService {
     @Autowired
     private UserService userService;
 
+    @Value("${shibui.remove.EntityDescriptor.validUntil:true}")
+    private Boolean removeValidUntil;
+
     private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescriptor ed, final EntityDescriptorRepresentation representation) {
         ed.setEntityID(representation.getEntityId());
         ed.setIdOfOwner(representation.getIdOfOwner());
@@ -282,6 +286,11 @@ public EntityDescriptorRepresentation createNewEntityDescriptorFromXMLOrigin(Ent
             userService.getCurrentUserGroup().getApproversList().isEmpty()) {
             ed.setApproved(true);
         }
+
+        if (removeValidUntil) {
+            ed.setValidUntil(null);
+        }
+
         EntityDescriptor savedEntity = entityDescriptorRepository.save(ed);
         beaconDataService.addBeaconEvent(new BeaconEvent(BeaconEventType.METADATA_SOURCE_CREATED));
         return createRepresentationFromDescriptor(savedEntity);
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 49487c448..b8bc0b840 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -138,5 +138,8 @@ management.server.port=9090
 management.endpoints.web.cors.allowed-origins=*
 management.endpoints.web.cors.allowed-headers=*
 
+### Lucene temp dir location to use
+shibui.lucene.dir=/var/tmp/shibui-cache
+
 # When true, this will remove the validUntil attribute for an EntityDescriptor uploaded from XML source, only set to false if you want the XML uploaded as is
 # shibui.remove.EntityDescriptor.validUntil=true
\ No newline at end of file