diff --git a/repertory/librepertory/include/comm/curl/curl_comm.hpp b/repertory/librepertory/include/comm/curl/curl_comm.hpp
index 83fd636e..8ab68076 100644
--- a/repertory/librepertory/include/comm/curl/curl_comm.hpp
+++ b/repertory/librepertory/include/comm/curl/curl_comm.hpp
@@ -90,7 +90,8 @@ public:
 
     data_buffer data{};
     const auto key =
-        utils::encryption::generate_key(request.decryption_token.value());
+        utils::encryption::generate_key<utils::encryption::hash_256_t>(
+            request.decryption_token.value());
     const auto result = utils::encryption::read_encrypted_range(
         request.range.value(), key,
         [&](data_buffer &ct, std::uint64_t start_offset,
diff --git a/repertory/librepertory/include/utils/encrypt.hpp b/repertory/librepertory/include/utils/encrypt.hpp
index f474cace..ac268c0d 100644
--- a/repertory/librepertory/include/utils/encrypt.hpp
+++ b/repertory/librepertory/include/utils/encrypt.hpp
@@ -36,10 +36,11 @@ using reader_func = std::function<api_error(data_buffer &cypher_text,
 [[nodiscard]] auto decrypt_file_name(std::string_view encryption_token,
                                      std::string &file_name) -> api_error;
 
-[[nodiscard]] auto read_encrypted_range(const http_range &range,
-                                        const key_type &key, reader_func reader,
-                                        std::uint64_t total_size,
-                                        data_buffer &data) -> api_error;
+[[nodiscard]] auto
+read_encrypted_range(const http_range &range,
+                     const utils::encryption::hash_256_t &key &key,
+                     reader_func reader, std::uint64_t total_size,
+                     data_buffer &data) -> api_error;
 } // namespace repertory::utils::encryption
 
 #endif // INCLUDE_UTILS_ENCRYPT_HPP_
diff --git a/repertory/librepertory/include/utils/encrypting_reader.hpp b/repertory/librepertory/include/utils/encrypting_reader.hpp
index 88b1eda2..b4d4bb6a 100644
--- a/repertory/librepertory/include/utils/encrypting_reader.hpp
+++ b/repertory/librepertory/include/utils/encrypting_reader.hpp
@@ -59,7 +59,7 @@ public:
   using streambuf = std::basic_streambuf<char, std::char_traits<char>>;
 
 private:
-  key_type key_;
+  utils::encryption::hash_256_t key_;
   stop_type &stop_requested_;
   size_t error_return_;
   std::unordered_map<std::size_t, data_buffer> chunk_buffers_;
diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp
index 13ada99b..7240e099 100644
--- a/repertory/librepertory/src/providers/s3/s3_provider.cpp
+++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp
@@ -736,7 +736,8 @@ auto s3_provider::read_file_bytes(const std::string &api_path, std::size_t size,
 
       return utils::encryption::read_encrypted_range(
           {offset, offset + size - 1U},
-          utils::encryption::generate_key(cfg.encryption_token),
+          utils::encryption::generate_key<utils::encryption::hash_256_t>(
+              cfg.encryption_token),
           [&](data_buffer &ct_buffer, std::uint64_t start_offset,
               std::uint64_t end_offset) -> api_error {
             return read_bytes((end_offset - start_offset + 1U), start_offset,
diff --git a/repertory/librepertory/src/utils/encrypt.cpp b/repertory/librepertory/src/utils/encrypt.cpp
index f7092b20..b9982743 100644
--- a/repertory/librepertory/src/utils/encrypt.cpp
+++ b/repertory/librepertory/src/utils/encrypt.cpp
@@ -26,6 +26,7 @@
 #include "types/repertory.hpp"
 #include "utils/collection.hpp"
 #include "utils/encrypting_reader.hpp"
+#include "utils/encryption.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory::utils::encryption {
@@ -66,7 +67,8 @@ auto decrypt_file_name(std::string_view encryption_token,
   return api_error::success;
 }
 
-auto read_encrypted_range(const http_range &range, const key_type &key,
+auto read_encrypted_range(const http_range &range,
+                          const utils::encryption::hash_256_t &key,
                           reader_func reader, std::uint64_t total_size,
                           data_buffer &data) -> api_error {
   const auto encrypted_chunk_size =
diff --git a/repertory/librepertory/src/utils/encrypting_reader.cpp b/repertory/librepertory/src/utils/encrypting_reader.cpp
index 5645a3fa..c61e2610 100644
--- a/repertory/librepertory/src/utils/encrypting_reader.cpp
+++ b/repertory/librepertory/src/utils/encrypting_reader.cpp
@@ -167,7 +167,8 @@ encrypting_reader::encrypting_reader(
     stop_type &stop_requested, std::string_view token,
     std::optional<std::string_view> relative_parent_path,
     std::size_t error_return)
-    : key_(utils::encryption::generate_key(token)),
+    : key_(utils::encryption::generate_key<utils::encryption::hash_256_t>(
+          token)),
       stop_requested_(stop_requested),
       error_return_(error_return) {
   const auto res = native_file::create_or_open(source_path, true, source_file_);
@@ -219,7 +220,8 @@ encrypting_reader::encrypting_reader(std::string_view encrypted_file_path,
                                      stop_type &stop_requested,
                                      std::string_view token,
                                      std::size_t error_return)
-    : key_(utils::encryption::generate_key(token)),
+    : key_(utils::encryption::generate_key<utils::encryption::hash_256_t>(
+          token)),
       stop_requested_(stop_requested),
       error_return_(error_return) {
   const auto res = native_file::create_or_open(source_path, true, source_file_);
@@ -261,7 +263,8 @@ encrypting_reader::encrypting_reader(
         std::array<unsigned char, crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>>
         iv_list,
     std::size_t error_return)
-    : key_(utils::encryption::generate_key(token)),
+    : key_(utils::encryption::generate_key<utils::encryption::hash_256_t>(
+          token)),
       stop_requested_(stop_requested),
       error_return_(error_return) {
   const auto res = native_file::create_or_open(source_path, true, source_file_);