diff --git a/doctrine/mongodb-odm-bundle/3.3/config/packages/doctrine_mongodb.yaml b/doctrine/mongodb-odm-bundle/3.3/config/packages/doctrine_mongodb.yaml
index 7c5030f6..a9a22024 100644
--- a/doctrine/mongodb-odm-bundle/3.3/config/packages/doctrine_mongodb.yaml
+++ b/doctrine/mongodb-odm-bundle/3.3/config/packages/doctrine_mongodb.yaml
@@ -1,6 +1,6 @@
 doctrine_mongodb:
-    auto_generate_proxy_classes: '%kernel.debug%'
-    auto_generate_hydrator_classes: '%kernel.debug%'
+    auto_generate_proxy_classes: true
+    auto_generate_hydrator_classes: true
     connections:
         default:
             server: '%env(resolve:MONGODB_URL)%'
diff --git a/doctrine/mongodb-odm-bundle/3.3/config/packages/prod/doctrine_mongodb.yaml b/doctrine/mongodb-odm-bundle/3.3/config/packages/prod/doctrine_mongodb.yaml
new file mode 100644
index 00000000..60f6b834
--- /dev/null
+++ b/doctrine/mongodb-odm-bundle/3.3/config/packages/prod/doctrine_mongodb.yaml
@@ -0,0 +1,21 @@
+doctrine_mongodb:
+    auto_generate_proxy_classes: false
+    auto_generate_hydrator_classes: false
+    document_managers:
+        default:
+            metadata_cache_driver:
+                type: service
+                id: doctrine_mongodb.system_cache_provider
+
+services:
+    doctrine_mongodb.system_cache_provider:
+        class: Symfony\Component\Cache\DoctrineProvider
+        public: false
+        arguments:
+            - '@doctrine_mongodb.system_cache_pool'
+
+framework:
+    cache:
+        pools:
+            doctrine_mongodb.system_cache_pool:
+                adapter: cache.system