diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala
index 917747a..1ef2ac8 100644
--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -43,7 +43,10 @@
           ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
       }
-      props.store(new java.io.FileOutputStream(GitBucketConf), null)
+      using(new java.io.FileOutputStream(GitBucketConf)) {
+        out =>
+          props.store(out, null)
+      }
     }
   }
 
@@ -51,7 +54,10 @@
   def loadSystemSettings(): SystemSettings = {
     defining(new java.util.Properties()){ props =>
       if(GitBucketConf.exists){
-        props.load(new java.io.FileInputStream(GitBucketConf))
+        using(new java.io.FileInputStream(GitBucketConf)) {
+          in =>
+            props.load(in)
+        }
       }
       SystemSettings(
         getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),