diff --git a/Dockerfile b/Dockerfile
index 2c9ef2d..5117199 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       libevent-dev \
       lua5.1 \
+      lua-bitop \
       lua-dbi-sqlite3 \
       lua-dbi-mysql \
       lua-dbi-postgresql \
@@ -16,9 +17,9 @@ RUN apt-get update \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-ENV PROSODY_VERSION 0.9.12
+ENV PROSODY_VERSION 0.10.0
 ENV PROSODY_DOWNLOAD_URL https://prosody.im/downloads/source/prosody-${PROSODY_VERSION}.tar.gz
-ENV PROSODY_DOWNLOAD_SHA1 1ee224263a5b3d67960e12edbbe6b2f16b95d147
+ENV PROSODY_DOWNLOAD_SHA1 57c1c5a665e6453bdde06727ef398cd69accd9d7
 
 RUN buildDeps='gcc libc6-dev make liblua5.1-dev libidn11-dev libssl-dev' \
  && set -x \
@@ -58,7 +59,6 @@ RUN docker-prosody-module-install \
         e2e_policy `# require end-2-end encryption` \
         filter_chatstates `# disable "X is typing" type messages` \
         http_upload `# file sharing (XEP-0363)` \
-        mam `# message archive management (XEP-0313)` \
         smacks `# stream management (XEP-0198)` \
         throttle_presence `# presence throttling in CSI`
 
diff --git a/conf.d/01-modules.cfg.lua b/conf.d/01-modules.cfg.lua
index 2618b8c..5956d26 100644
--- a/conf.d/01-modules.cfg.lua
+++ b/conf.d/01-modules.cfg.lua
@@ -9,11 +9,11 @@ modules_enabled = {
     "disco"; -- Service discovery
 
     -- Not essential, but recommended
+    "blocklist"; -- simple modern protocol for blocking remote JIDs (XEP-0191)
     "private"; -- Private XML storage (for room bookmarks, etc.)
     "vcard"; -- Allow users to set vCards
 
     -- These are commented by default as they have a performance impact
-    "privacy"; -- Support privacy lists
     --"compression"; -- Stream compression (Debian: requires lua-zlib module to work)
 
     -- Nice to have
diff --git a/conf.d/02-storage.cfg.lua b/conf.d/02-storage.cfg.lua
index 69cf370..374c8d0 100644
--- a/conf.d/02-storage.cfg.lua
+++ b/conf.d/02-storage.cfg.lua
@@ -4,6 +4,9 @@ sql = {
   database = "prosody.sqlite";
 }
 
+-- make 0.10-distributed mod_mam use sql store
+archive_store = "archive2" -- Use the same data store as prosody-modules mod_mam
+
 storage = {
   -- this makes mod_mam use the sql storage backend
   archive2 = "sql";