diff --git a/.koppie/config/initializers/1_valkyrie.rb b/.koppie/config/initializers/1_valkyrie.rb
index 5fbfeb7012..024d4a91f2 100644
--- a/.koppie/config/initializers/1_valkyrie.rb
+++ b/.koppie/config/initializers/1_valkyrie.rb
@@ -34,7 +34,9 @@
       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
     base_path: Rails.env,
     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
-    fedora_version: 6
+    fedora_version: 6.5,
+    fedora_pairtree_count: 4,
+    fedora_pairtree_length: 2
   ), :fedora_metadata
 )
 
@@ -64,7 +66,9 @@
     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
     base_path: Rails.env,
-    fedora_version: 6
+    fedora_version: 6.5,
+    fedora_pairtree_count: 4,
+    fedora_pairtree_length: 2
   ), :fedora_storage
 )
 
diff --git a/docker-compose-sirenia.yml b/docker-compose-sirenia.yml
index 15cf030c98..df9586e745 100644
--- a/docker-compose-sirenia.yml
+++ b/docker-compose-sirenia.yml
@@ -134,7 +134,8 @@ services:
         CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
         -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
         -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
-      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+        -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
+      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
     volumes:
       - fcrepo:/fcrepo-home
     ports:
diff --git a/hyrax.gemspec b/hyrax.gemspec
index a86bc9be16..f444e098dd 100644
--- a/hyrax.gemspec
+++ b/hyrax.gemspec
@@ -85,7 +85,7 @@ SUMMARY
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
-  spec.add_dependency 'valkyrie', '~> 3.1.1'
+  spec.add_dependency 'valkyrie', '~> 3.3'
   spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
   spec.add_dependency 'sprockets', '3.7.2' # 3.7.3 fails feature specs
   spec.add_dependency 'sass-rails', '~> 6.0'
diff --git a/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb b/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb
index d7d5b7a68c..c59e31d0d4 100644
--- a/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb
+++ b/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb
@@ -36,7 +36,9 @@
 #     )),
 #     base_path: Rails.env,
 #     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_metadata
 # )
 
@@ -68,7 +70,9 @@
 #       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
 #     )),
 #     base_path: Rails.env,
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_storage
 # )